[pkgsrc/trunk]: pkgsrc/audio Add wavpack options and disable it by default in...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a6025b0c302
branches:  trunk
changeset: 398461:2a6025b0c302
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Jul 20 10:39:18 2019 +0000

description:
Add wavpack options and disable it by default in mixxx and audacious.

Kinda worried about the maintainance of this obscure file format - see
https://github.com/dbry/WavPack/issues/63

Bump PKGREVISIONs

diffstat:

 audio/audacious-plugins/Makefile   |   4 ++--
 audio/audacious-plugins/PLIST      |   4 ++--
 audio/audacious-plugins/options.mk |  12 ++++++++++--
 audio/mixxx/Makefile               |   6 +++---
 audio/mixxx/PLIST                  |   4 ++--
 audio/mixxx/options.mk             |  15 +++++++++++++++
 6 files changed, 34 insertions(+), 11 deletions(-)

diffs (132 lines):

diff -r e5f2b4034803 -r 2a6025b0c302 audio/audacious-plugins/Makefile
--- a/audio/audacious-plugins/Makefile  Sat Jul 20 07:06:17 2019 +0000
+++ b/audio/audacious-plugins/Makefile  Sat Jul 20 10:39:18 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2019/07/06 13:17:01 nia Exp $
+# $NetBSD: Makefile,v 1.94 2019/07/20 10:39:18 nia Exp $
 
 DISTNAME=      audacious-plugins-3.10.1
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  https://distfiles.audacious-media-player.org/
 EXTRACT_SUFX=  .tar.bz2
@@ -51,7 +52,6 @@
 .include "../../audio/libsoxr/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/mpg123/buildlink3.mk"
-.include "../../audio/wavpack/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/libbinio/buildlink3.mk"
 .include "../../misc/libcdio-paranoia/buildlink3.mk"
diff -r e5f2b4034803 -r 2a6025b0c302 audio/audacious-plugins/PLIST
--- a/audio/audacious-plugins/PLIST     Sat Jul 20 07:06:17 2019 +0000
+++ b/audio/audacious-plugins/PLIST     Sat Jul 20 10:39:18 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2019/07/06 13:17:01 nia Exp $
+@comment $NetBSD: PLIST,v 1.17 2019/07/20 10:39:18 nia Exp $
 lib/audacious/Container/asx.so
 lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
@@ -55,7 +55,7 @@
 lib/audacious/Input/tonegen.so
 lib/audacious/Input/vorbis.so
 lib/audacious/Input/vtx.so
-lib/audacious/Input/wavpack.so
+${PLIST.wavpack}lib/audacious/Input/wavpack.so
 lib/audacious/Input/xsf.so
 ${PLIST.alsa}lib/audacious/Output/alsa.so
 lib/audacious/Output/filewriter.so
diff -r e5f2b4034803 -r 2a6025b0c302 audio/audacious-plugins/options.mk
--- a/audio/audacious-plugins/options.mk        Sat Jul 20 07:06:17 2019 +0000
+++ b/audio/audacious-plugins/options.mk        Sat Jul 20 10:39:18 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.10 2019/07/06 13:17:01 nia Exp $
+# $NetBSD: options.mk,v 1.11 2019/07/20 10:39:18 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.audacious-plugins
 PKG_SUPPORTED_OPTIONS+=                alsa jack pulseaudio lirc
-PKG_SUPPORTED_OPTIONS+=                adplug sidplay fluidsynth libgme modplug
+PKG_SUPPORTED_OPTIONS+=                adplug sidplay fluidsynth libgme modplug wavpack
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa lirc
 PKG_OPTIONS_LEGACY_OPTS+=      sid:sidplay
 
@@ -79,3 +79,11 @@
 .else
 CONFIGURE_ARGS+=       --disable-modplug
 .endif
+
+PLIST_VARS+=   wavpack
+.if !empty(PKG_OPTIONS:Mwavpack)
+.  include "../../audio/wavpack/buildlink3.mk"
+PLIST.wavpack= yes
+.else
+CONFIGURE_ARGS+=       --disable-wavpack
+.endif
diff -r e5f2b4034803 -r 2a6025b0c302 audio/mixxx/Makefile
--- a/audio/mixxx/Makefile      Sat Jul 20 07:06:17 2019 +0000
+++ b/audio/mixxx/Makefile      Sat Jul 20 10:39:18 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/07/15 16:56:48 nia Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/20 10:39:18 nia Exp $
 
 DISTNAME=      mixxx-2.2.1
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mixxxdj/}
 GITHUB_TAG=    release-${PKGVERSION_NOREV}
@@ -35,7 +36,6 @@
 
 SCONS_ARGS+=   faad=1
 SCONS_ARGS+=   modplug=1
-SCONS_ARGS+=   wv=1
 SCONS_ARGS+=   vamp=0 # XXX needs vamp-plugin-sdk update
 
 SCONS_ARGS+=   build="release"
@@ -76,6 +76,7 @@
             LINKFLAGS=${LDFLAGS:Q} qtdir=${QTDIR:Q} prefix=${PREFIX} install \
            --install-sandbox=${DESTDIR}
 
+.include "options.mk"
 .include "../../audio/chromaprint/buildlink3.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
@@ -93,7 +94,6 @@
 .include "../../audio/rubberband/buildlink3.mk"
 .include "../../audio/soundtouch/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
-.include "../../audio/wavpack/buildlink3.mk"
 .include "../../comms/libhidapi/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
diff -r e5f2b4034803 -r 2a6025b0c302 audio/mixxx/PLIST
--- a/audio/mixxx/PLIST Sat Jul 20 07:06:17 2019 +0000
+++ b/audio/mixxx/PLIST Sat Jul 20 10:39:18 2019 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2019/07/08 16:46:32 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/20 10:39:18 nia Exp $
 bin/mixxx
 lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so
-lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
+${PLIST.wavpack}lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
 share/appdata/mixxx.appdata.xml
 share/applications/mixxx.desktop
 share/doc/mixxx/LICENSE
diff -r e5f2b4034803 -r 2a6025b0c302 audio/mixxx/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mixxx/options.mk    Sat Jul 20 10:39:18 2019 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2019/07/20 10:39:18 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.mixxx
+PKG_SUPPORTED_OPTIONS=         wavpack
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   wavpack
+.if !empty(PKG_OPTIONS:Mwavpack)
+PLIST.wavpack= yes
+SCONS_ARGS+=   wv=1
+.include "../../audio/wavpack/buildlink3.mk"
+.else
+SCONS_ARGS+=   wv=0
+.endif