efl-current: remove libuv dependency, build with debug options

[kikadf <kikadf.01%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Wed Jun 10 09:45:42 2020 +0200
Changeset:	56dc515837e1f53b4d04f2a3fc75e83f57c91001

Modified Files:
	efl-current/Makefile
	efl-current/PLIST
	efl-current/buildlink3.mk

Log Message:
efl-current: remove libuv dependency, build with debug options

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=56dc515837e1f53b4d04f2a3fc75e83f57c91001

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 efl-current/Makefile      | 24 +++++++++++-------------
 efl-current/PLIST         | 10 ----------
 efl-current/buildlink3.mk |  7 ++-----
 3 files changed, 13 insertions(+), 28 deletions(-)

diffs:
diff --git a/efl-current/Makefile b/efl-current/Makefile
index e90c3d0203..093b27ea34 100644
--- a/efl-current/Makefile
+++ b/efl-current/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	efl-1.24.2
 CATEGORIES=	x11
+PKGREVISION=	1
 MASTER_SITES=	https://download.enlightenment.org/rel/libs/efl/
 EXTRACT_SUFX=	.tar.xz
 
@@ -12,9 +13,9 @@ LICENSE=	2-clause-bsd
 
 EFL_LIBRARY_PATH=	${WRKSRC}/output/src/lib
 
-EFLLIBS=	ecore ecore_audio ecore_avahi ecore_con ecore_evas
-EFLLIBS+=	ecore_file ecore_imf ecore_imf_evas ecore_input ecore_input_evas
-EFLLIBS+=	ecore_ipc ecore_sdl ecore_x ector edje eet efl efreet
+EFLLIBS=	ecore ecore_audio ecore_con ecore_evas ecore_file
+EFLLIBS+=	ecore_imf ecore_imf_evas ecore_input ecore_input_evas
+EFLLIBS+=	ecore_ipc ecore_x ector edje eet efl efreet
 EFLLIBS+=	eina eio eldbus elementary elua embryo emile emotion
 EFLLIBS+=	eo eolian ephysics ethumb ethumb_client evas evil
 
@@ -26,18 +27,18 @@ MAKE_ENV+=	LD_LIBRARY_PATH=${EFL_LIBRARY_PATH}
 
 MESON_ARGS+=	-Dsystemd=false
 MESON_ARGS+=	-Deeze=false
-MESON_ARGS+=	-Dpulseaudio=false
 MESON_ARGS+=	-Dbuild-tests=false
 MESON_ARGS+=	-Dbuild-examples=false
 MESON_ARGS+=	-Dphysics=true
-MESON_ARGS+=	-Davahi=true
-MESON_ARGS+=	-Dsdl=true
 MESON_ARGS+=	-Dglib=true
 MESON_ARGS+=	-Dg-mainloop=true
 
-USE_LANGUAGES=		c c++
-USE_TOOLS=		pkg-config
-ICON_THEMES=		yes
+CFLAGS+=	-g -ggdb3
+
+USE_LIBTOOL=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS=	pkg-config
+ICON_THEMES=	yes
 
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
@@ -70,12 +71,10 @@ SUBST_SED.fix-options=		-e "s|'es-egl', 'none'|'es-egl', 'base', 'none'|g"
 MESON_ARGS+=	-Dopengl=base
 .endif
 
-.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/bullet/buildlink3.mk"
-.include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/meson/build.mk"
-.include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libraw/buildlink3.mk"
@@ -86,7 +85,6 @@ MESON_ARGS+=	-Dopengl=base
 .include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../net/avahi/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/efl-current/PLIST b/efl-current/PLIST
index b9293fe610..f8a3e16398 100644
--- a/efl-current/PLIST
+++ b/efl-current/PLIST
@@ -112,7 +112,6 @@ include/ecore-audio-1/ecore_audio_out_pulse.eo.h
 include/ecore-audio-1/ecore_audio_out_sndfile.eo.h
 include/ecore-audio-1/ecore_audio_out_wasapi.eo.h
 include/ecore-audio-1/ecore_audio_protected.h
-include/ecore-avahi-1/Ecore_Avahi.h
 include/ecore-con-1/Ecore_Con.h
 include/ecore-con-1/Ecore_Con_Eet.h
 include/ecore-con-1/Ecore_Con_Eet_Eo.h
@@ -254,8 +253,6 @@ include/ecore-imf-evas-1/Ecore_IMF_Evas.h
 include/ecore-input-1/Ecore_Input.h
 include/ecore-input-evas-1/Ecore_Input_Evas.h
 include/ecore-ipc-1/Ecore_Ipc.h
-include/ecore-sdl-1/Ecore_Sdl.h
-include/ecore-sdl-1/Ecore_Sdl_Keys.h
 include/ecore-x-1/Ecore_X.h
 include/ecore-x-1/Ecore_X_Atoms.h
 include/ecore-x-1/Ecore_X_Cursor.h
@@ -2070,7 +2067,6 @@ lib/cmake/EvasCxx/EvasCxxConfigVersion.cmake
 lib/ecore/system/upower/v-1.24/module.so
 lib/ecore_con/utils/v-1.24/efl_net_proxy_helper
 lib/ecore_evas/engines/extn/v-1.24/module.so
-lib/ecore_evas/engines/sdl/v-1.24/module.so
 lib/ecore_evas/engines/x/v-1.24/module.so
 lib/ecore_imf/modules/scim/v-1.24/module.so
 lib/ecore_imf/modules/xim/v-1.24/module.so
@@ -2214,9 +2210,6 @@ lib/libecore.so.${PKGVERSION}
 lib/libecore_audio.so
 lib/libecore_audio.so.1
 lib/libecore_audio.so.${PKGVERSION}
-lib/libecore_avahi.so
-lib/libecore_avahi.so.1
-lib/libecore_avahi.so.${PKGVERSION}
 lib/libecore_con.so
 lib/libecore_con.so.1
 lib/libecore_con.so.${PKGVERSION}
@@ -2241,7 +2234,6 @@ lib/libecore_input_evas.so.${PKGVERSION}
 lib/libecore_ipc.so
 lib/libecore_ipc.so.1
 lib/libecore_ipc.so.${PKGVERSION}
-lib/libecore_sdl.so
 lib/libecore_x.so
 lib/libecore_x.so.1
 lib/libecore_x.so.${PKGVERSION}
@@ -2318,7 +2310,6 @@ lib/libexactness_record.so
 lib/libexactness_record.so.1
 lib/libexactness_record.so.${PKGVERSION}
 lib/pkgconfig/ecore-audio.pc
-lib/pkgconfig/ecore-avahi.pc
 lib/pkgconfig/ecore-con.pc
 lib/pkgconfig/ecore-cxx.pc
 lib/pkgconfig/ecore-evas.pc
@@ -2328,7 +2319,6 @@ lib/pkgconfig/ecore-imf.pc
 lib/pkgconfig/ecore-input-evas.pc
 lib/pkgconfig/ecore-input.pc
 lib/pkgconfig/ecore-ipc.pc
-lib/pkgconfig/ecore-sdl.pc
 lib/pkgconfig/ecore-x.pc
 lib/pkgconfig/ecore.pc
 lib/pkgconfig/ector.pc
diff --git a/efl-current/buildlink3.mk b/efl-current/buildlink3.mk
index 3348596377..b71b26744c 100644
--- a/efl-current/buildlink3.mk
+++ b/efl-current/buildlink3.mk
@@ -5,14 +5,12 @@ BUILDLINK_TREE+=	efl
 .if !defined(EFL_BUILDLINK3_MK)
 EFL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.efl+=	efl>=1.24.1
+BUILDLINK_API_DEPENDS.efl+=	efl>=1.24.2nb1
 BUILDLINK_PKGSRCDIR.efl?=	../../wip/efl-current
 
-.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/bullet/buildlink3.mk"
-.include "../../devel/libuv/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/libraw/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
@@ -21,7 +19,6 @@ BUILDLINK_PKGSRCDIR.efl?=	../../wip/efl-current
 .include "../../inputmethod/scim/buildlink3.mk"
 .include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../net/avahi/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"