From 561165e5c3e92af5be2d0eca1f9dbc67c011354a Mon Sep 17 00:00:00 2001
From: Boris Faure <boris@fau.re>
Date: Tue, 1 Oct 2019 22:24:21 +0200
Subject: testing/efl: upgrade to 1.23.0

Build system has changed to meson/ninja
---
 testing/efl/APKBUILD | 110 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 61 insertions(+), 49 deletions(-)

diff --git a/testing/efl/APKBUILD b/testing/efl/APKBUILD
index 1f2163fcbb..9127d790a6 100644
--- a/testing/efl/APKBUILD
+++ b/testing/efl/APKBUILD
@@ -1,67 +1,79 @@
 # Contributor: Boris Faure <boris@fau.re>
 # Maintainer: Boris Faure <boris@fau.re>
 pkgname=efl
-pkgver=1.22.2
-pkgrel=1
+pkgver=1.23.0
+pkgrel=0
 pkgdesc="Enlightenment Foundation Libraries"
 url="https://www.enlightenment.org"
 arch="all !s390x" #luajit not available
 license="LGPL-2.1-only"
-depends_dev="giflib-dev gstreamer-dev gst-plugins-base-dev libpng-dev
-	libjpeg-turbo-dev libx11-dev libxcomposite-dev libxcursor-dev
-	libxdamage-dev libxinerama-dev libxrandr-dev libxtst-dev
-	libxscrnsaver-dev xorgproto luajit-dev"
-makedepends="$depends_dev dbus-dev openssl-dev fontconfig-dev freetype-dev bash
-	fribidi-dev zlib-dev"
+depends_dev="luajit-dev"
+makedepends="$depends_dev
+	meson
+	ninja
+	dbus-dev
+	fontconfig-dev
+	freetype-dev
+	fribidi-dev
+	giflib-dev
+	gstreamer-dev
+	gst-plugins-base-dev
+	harfbuzz-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	librsvg-dev
+	libsndfile-dev
+	libx11-dev
+	libxkbcommon-dev
+	libxcomposite-dev
+	libxcursor-dev
+	libxdamage-dev
+	libxinerama-dev
+	libxrandr-dev
+	libxtst-dev
+	libxscrnsaver-dev
+	mesa-dev
+	openssl-dev
+	wayland-dev
+	wayland-protocols
+	xorgproto"
 options="!check" # Test suite issues
 subpackages="$pkgname-dev"
 source="https://download.enlightenment.org/rel/libs/efl/efl-$pkgver.tar.xz"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+	meson \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--enable-image-loader-png \
-		--disable-audio \
-		--disable-avahi \
-		--disable-cserve \
-		--disable-cocoa \
-		--disable-doc \
-		--disable-eglfs \
-		--disable-elua \
-		--disable-glib \
-		--disable-gesture \
-		--disable-gstreamer \
-		--disable-image-loader-tiff \
-		--disable-image-loader-tgv \
-		--disable-libeeze \
-		--disable-libmount \
-		--disable-libraw \
-		--disable-librsvg \
-		--disable-libvlc \
-		--disable-nls \
-		--disable-neon \
-		--disable-physics \
-		--disable-poppler \
-		--disable-pulseaudio \
-		--disable-spectre \
-		--disable-systemd \
-		--disable-tslib \
-		--with-dbus-services= \
-		--with-glib=no \
-		--with-js=none \
-		--with-opengl=none \
-		--with-x \
-		--with-x11=xlib
-	make
+		--libdir /usr/lib \
+		--buildtype=release \
+		--default-library=shared \
+		 -Dnls=false \
+		 -Dopengl=es-egl \
+		 -Dxinput22=true \
+		 -Dbuffer=false \
+		 -Dfb=false \
+		 -Ddrm=false \
+		 -Dtslib=false \
+		 -Dharfbuzz=true \
+		 -Dwl=true \
+		 -Dnetwork-backend=connman \
+		 -Devas-loaders-disabler=pdf,ps,raw,tiff,json,webp \
+		 -Dphysics=false \
+		 -Dsystemd=false \
+		 -Dpulseaudio=false \
+		 -Davahi=false \
+		 -Deeze=false \
+		 -Dbindings= \
+		 -Dbuild-examples=false \
+		 -Dbuild-tests=false \
+		 -Decore-imf-loaders-disabler=ibus,scim \
+		 . build
+
+	 ninja -C build
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" ninja -C build install
 }
 
-sha512sums="7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734  efl-1.22.2.tar.xz"
+sha512sums="6f96b822a8e8d44309b6174f2bde66aec8cce94386574e61fac88ab539113fec173e7f00db16a03d83b7294f5d4892800861cfda2f2b72bb78636a781bfd21b3  efl-1.23.0.tar.xz"
-- 
cgit v1.2.3