pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

efl: add pulseaudio support as option (enabled by default)



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Thu Jan 14 10:27:52 2021 +0100
Changeset:	5e796292f9f4e80720786a2ef1a0359a9ec5848b

Modified Files:
	efl/Makefile
	efl/buildlink3.mk
	efl/options.mk

Log Message:
efl: add pulseaudio support as option
(enabled by default)

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

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

diffstat:
 efl/Makefile      |  5 +++--
 efl/buildlink3.mk |  7 ++++++-
 efl/options.mk    | 11 +++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diffs:
diff --git a/efl/Makefile b/efl/Makefile
index 34297ffdf3..789f89919e 100644
--- a/efl/Makefile
+++ b/efl/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	efl-1.25.1
 CATEGORIES=	x11
-PKGREVISION=	3
+PKGREVISION=	4
 MASTER_SITES=	https://download.enlightenment.org/rel/libs/efl/
 EXTRACT_SUFX=	.tar.xz
 
@@ -82,7 +82,7 @@ MESON_ARGS+=	-Dopengl=base
 
 .endif
 
-.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/bullet/buildlink3.mk"
 .include "../../devel/meson/build.mk"
@@ -98,6 +98,7 @@ MESON_ARGS+=	-Dopengl=base
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
diff --git a/efl/buildlink3.mk b/efl/buildlink3.mk
index 61c610dd95..3638c52b65 100644
--- a/efl/buildlink3.mk
+++ b/efl/buildlink3.mk
@@ -15,6 +15,10 @@ pkgbase := efl
 .include "../../devel/libuv/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS.efl:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+.endif
+
 .if ${X11_TYPE} == "modular"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
@@ -22,7 +26,7 @@ pkgbase := efl
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .endif
 
-.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/bullet/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
@@ -35,6 +39,7 @@ pkgbase := efl
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
diff --git a/efl/options.mk b/efl/options.mk
index 4df671c563..da4eaaeeeb 100644
--- a/efl/options.mk
+++ b/efl/options.mk
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.efl
-PKG_SUPPORTED_OPTIONS=		debug g-mainloop gcc8
+PKG_SUPPORTED_OPTIONS=		debug g-mainloop gcc8 pulseaudio
 PKG_SUGGESTED_OPTIONS.NetBSD=	g-mainloop
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=		pulseaudio
 
 .include "../../mk/bsd.options.mk"
 
@@ -25,3 +25,10 @@ MESON_ARGS+=	-Dg-mainloop=true
 USE_PKGSRC_GCC=	yes
 GCC_REQD=	8
 .endif
+
+# Build with pulseaudio support
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+MESON_ARGS+=	-Dpulseaudio=false
+.endif


Home | Main Index | Thread Index | Old Index