CVS commit: pkgsrc/audio/pulseaudio

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Jul  1 10:25:24 UTC 2019

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile PLIST options.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/audio/pulseaudio/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/pulseaudio/options.mk

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

Modified files:

Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.135 pkgsrc/audio/pulseaudio/Makefile:1.136
--- pkgsrc/audio/pulseaudio/Makefile:1.135      Sun Jun 23 04:46:20 2019
+++ pkgsrc/audio/pulseaudio/Makefile    Mon Jul  1 10:25:24 2019
@@ -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

Index: pkgsrc/audio/pulseaudio/PLIST
diff -u pkgsrc/audio/pulseaudio/PLIST:1.29 pkgsrc/audio/pulseaudio/PLIST:1.30
--- pkgsrc/audio/pulseaudio/PLIST:1.29  Wed Jul 25 12:15:59 2018
+++ pkgsrc/audio/pulseaudio/PLIST       Mon Jul  1 10:25:24 2019
@@ -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-
 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

Index: pkgsrc/audio/pulseaudio/options.mk
diff -u pkgsrc/audio/pulseaudio/options.mk:1.9 pkgsrc/audio/pulseaudio/options.mk:1.10
--- pkgsrc/audio/pulseaudio/options.mk:1.9      Wed Jul 25 12:15:59 2018
+++ pkgsrc/audio/pulseaudio/options.mk  Mon Jul  1 10:25:24 2019
@@ -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"