From 065f151918b5306a2d3df4e666565a915eb64a4d Mon Sep 17 00:00:00 2001 From: triaxx Date: Mon, 1 Jul 2019 10:25:24 +0000 Subject: pulseaudio: add option for lirc to fix build error on Arch Linux pkgsrc changes: --------------- * Add PLIST.lirc and lirc in options.mk to provide lirc only on systems for which it is availble (thanks to leot@) * Move gsettings in options.mk (to respect alphabetic order) * Bump revision --- audio/pulseaudio/Makefile | 4 ++-- audio/pulseaudio/PLIST | 4 +++- audio/pulseaudio/options.mk | 29 +++++++++++++++++++++-------- 3 files changed, 26 insertions(+), 11 deletions(-) (limited to 'audio/pulseaudio') diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 5051a207735..c862a8d903e 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.135 2019/06/23 04:46:20 tsutsui Exp $ +# $NetBSD: Makefile,v 1.136 2019/07/01 10:25:24 triaxx Exp $ DISTNAME= pulseaudio-12.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= audio MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/ EXTRACT_SUFX= .tar.xz diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST index d172c511fe9..0de94c41e29 100644 --- a/audio/pulseaudio/PLIST +++ b/audio/pulseaudio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.29 2018/07/25 12:15:59 adam Exp $ +@comment $NetBSD: PLIST,v 1.30 2019/07/01 10:25:24 triaxx Exp $ bin/esdcompat bin/pacat bin/pacmd @@ -147,6 +147,8 @@ lib/pulse-${PULSELIBVER}/modules/module-intended-roles.a lib/pulse-${PULSELIBVER}/modules/module-intended-roles.so lib/pulse-${PULSELIBVER}/modules/module-ladspa-sink.a lib/pulse-${PULSELIBVER}/modules/module-ladspa-sink.so +${PLIST.lirc}lib/pulse-${PULSELIBVER}/modules/module-lirc.a +${PLIST.lirc}lib/pulse-${PULSELIBVER}/modules/module-lirc.so lib/pulse-${PULSELIBVER}/modules/module-loopback.a lib/pulse-${PULSELIBVER}/modules/module-loopback.so lib/pulse-${PULSELIBVER}/modules/module-match.a diff --git a/audio/pulseaudio/options.mk b/audio/pulseaudio/options.mk index 9f08f5f225e..f38c34d6640 100644 --- a/audio/pulseaudio/options.mk +++ b/audio/pulseaudio/options.mk @@ -1,7 +1,12 @@ -# $NetBSD: options.mk,v 1.9 2018/07/25 12:15:59 adam Exp $ +# $NetBSD: options.mk,v 1.10 2019/07/01 10:25:24 triaxx Exp $ + +.include "../../comms/lirc/available.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio PKG_SUPPORTED_OPTIONS= avahi fftw gsettings x11 +.if ${LIRC_AVAILABLE} == "yes" +PKG_SUPPORTED_OPTIONS+= lirc +.endif PKG_SUGGESTED_OPTIONS= avahi x11 PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} @@ -14,13 +19,6 @@ PLIST.avahi= yes CONFIGURE_ARGS+= --disable-avahi .endif -.if !empty(PKG_OPTIONS:Mgsettings) -PLIST.gsettings= yes -CONFIGURE_ARGS+= --enable-gsettings -.else -CONFIGURE_ARGS+= --disable-gsettings -.endif - .if !empty(PKG_OPTIONS:Mfftw) CONFIGURE_ARGS+= --with-fftw PLIST.fftw= yes @@ -40,6 +38,21 @@ REPLACE_FILES.pulse_py= src/utils/qpaeq CONFIGURE_ARGS+= --without-fftw .endif +.if !empty(PKG_OPTIONS:Mgsettings) +PLIST.gsettings= yes +CONFIGURE_ARGS+= --enable-gsettings +.else +CONFIGURE_ARGS+= --disable-gsettings +.endif + +.if !empty(PKG_OPTIONS:Mlirc) +PLIST.lirc= yes +CONFIGURE_ARGS+= --enable-lirc +.include "../../comms/lirc/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-lirc +.endif + .if !empty(PKG_OPTIONS:Mx11) .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" -- cgit v1.2.3