pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/audio/pulseaudio pulseaudio: add option for lirc to fi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/86983e3c851d
branches:  trunk
changeset: 397607:86983e3c851d
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Mon Jul 01 10:25:24 2019 +0000

description:
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

diffstat:

 audio/pulseaudio/Makefile   |   4 ++--
 audio/pulseaudio/PLIST      |   4 +++-
 audio/pulseaudio/options.mk |  29 +++++++++++++++++++++--------
 3 files changed, 26 insertions(+), 11 deletions(-)

diffs (84 lines):

diff -r 7fbe60113ead -r 86983e3c851d audio/pulseaudio/Makefile
--- a/audio/pulseaudio/Makefile Mon Jul 01 09:09:52 2019 +0000
+++ b/audio/pulseaudio/Makefile Mon Jul 01 10:25:24 2019 +0000
@@ -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 -r 7fbe60113ead -r 86983e3c851d audio/pulseaudio/PLIST
--- a/audio/pulseaudio/PLIST    Mon Jul 01 09:09:52 2019 +0000
+++ b/audio/pulseaudio/PLIST    Mon Jul 01 10:25:24 2019 +0000
@@ -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.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 -r 7fbe60113ead -r 86983e3c851d audio/pulseaudio/options.mk
--- a/audio/pulseaudio/options.mk       Mon Jul 01 09:09:52 2019 +0000
+++ b/audio/pulseaudio/options.mk       Mon Jul 01 10:25:24 2019 +0000
@@ -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 @@
 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 @@
 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"



Home | Main Index | Thread Index | Old Index