diff options
| -rw-r--r-- | audio/audacious-plugins/Makefile | 4 | ||||
| -rw-r--r-- | audio/audacious-plugins/PLIST | 4 | ||||
| -rw-r--r-- | audio/audacious-plugins/options.mk | 12 | ||||
| -rw-r--r-- | audio/mixxx/Makefile | 6 | ||||
| -rw-r--r-- | audio/mixxx/PLIST | 4 | ||||
| -rw-r--r-- | audio/mixxx/options.mk | 15 |
6 files changed, 34 insertions, 11 deletions
diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile index e24981bb473..83df85d462c 100644 --- a/audio/audacious-plugins/Makefile +++ b/audio/audacious-plugins/Makefile @@ -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 @@ CONFIGURE_ARGS+= --disable-gtk .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 --git a/audio/audacious-plugins/PLIST b/audio/audacious-plugins/PLIST index d8ccabc6404..3e0c45034e4 100644 --- a/audio/audacious-plugins/PLIST +++ b/audio/audacious-plugins/PLIST @@ -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/sndfile.so 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 --git a/audio/audacious-plugins/options.mk b/audio/audacious-plugins/options.mk index 963cce94d13..2f45c94fd4c 100644 --- a/audio/audacious-plugins/options.mk +++ b/audio/audacious-plugins/options.mk @@ -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 @@ PLIST.modplug= yes .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 --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 0308bb3d50f..1170baa7694 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -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 @@ SUBST_VARS.base= LOCALBASE 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 @@ do-install: 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 @@ do-install: .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 --git a/audio/mixxx/PLIST b/audio/mixxx/PLIST index 855ea7243b3..120b3908370 100644 --- a/audio/mixxx/PLIST +++ b/audio/mixxx/PLIST @@ -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 --git a/audio/mixxx/options.mk b/audio/mixxx/options.mk new file mode 100644 index 00000000000..6882362a58a --- /dev/null +++ b/audio/mixxx/options.mk @@ -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 |