CVS commit: pkgsrc/audio

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sat, 20 Jul 2019 10:39:18 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul 20 10:39:18 UTC 2019

Modified Files:
        pkgsrc/audio/audacious-plugins: Makefile PLIST options.mk
        pkgsrc/audio/mixxx: Makefile PLIST
Added Files:
        pkgsrc/audio/mixxx: options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/audio/audacious-plugins/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/audacious-plugins/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/audacious-plugins/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/mixxx/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/mixxx/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/mixxx/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/audacious-plugins/Makefile
diff -u pkgsrc/audio/audacious-plugins/Makefile:1.93 pkgsrc/audio/audacious-plugins/Makefile:1.94
--- pkgsrc/audio/audacious-plugins/Makefile:1.93        Sat Jul  6 13:17:01 2019
+++ pkgsrc/audio/audacious-plugins/Makefile     Sat Jul 20 10:39:18 2019
@@ -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"

Index: pkgsrc/audio/audacious-plugins/PLIST
diff -u pkgsrc/audio/audacious-plugins/PLIST:1.16 pkgsrc/audio/audacious-plugins/PLIST:1.17
--- pkgsrc/audio/audacious-plugins/PLIST:1.16   Sat Jul  6 13:17:01 2019
+++ pkgsrc/audio/audacious-plugins/PLIST        Sat Jul 20 10:39:18 2019
@@ -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

Index: pkgsrc/audio/audacious-plugins/options.mk
diff -u pkgsrc/audio/audacious-plugins/options.mk:1.10 pkgsrc/audio/audacious-plugins/options.mk:1.11
--- pkgsrc/audio/audacious-plugins/options.mk:1.10      Sat Jul  6 13:17:01 2019
+++ pkgsrc/audio/audacious-plugins/options.mk   Sat Jul 20 10:39:18 2019
@@ -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

Index: pkgsrc/audio/mixxx/Makefile
diff -u pkgsrc/audio/mixxx/Makefile:1.3 pkgsrc/audio/mixxx/Makefile:1.4
--- pkgsrc/audio/mixxx/Makefile:1.3     Mon Jul 15 16:56:48 2019
+++ pkgsrc/audio/mixxx/Makefile Sat Jul 20 10:39:18 2019
@@ -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"

Index: pkgsrc/audio/mixxx/PLIST
diff -u pkgsrc/audio/mixxx/PLIST:1.1 pkgsrc/audio/mixxx/PLIST:1.2
--- pkgsrc/audio/mixxx/PLIST:1.1        Mon Jul  8 16:46:32 2019
+++ pkgsrc/audio/mixxx/PLIST    Sat Jul 20 10:39:18 2019
@@ -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

Added files:

Index: pkgsrc/audio/mixxx/options.mk
diff -u /dev/null pkgsrc/audio/mixxx/options.mk:1.1
--- /dev/null   Sat Jul 20 10:39:18 2019
+++ pkgsrc/audio/mixxx/options.mk       Sat Jul 20 10:39:18 2019
@@ -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

Prev by Date: CVS commit: pkgsrc/devel/p5-Test-Compile
Next by Date: CVS commit: pkgsrc/chat/weechat
Previous by Thread: CVS commit: pkgsrc/devel/p5-Test-Compile
Next by Thread: CVS commit: pkgsrc/chat/weechat
Indexes:

Home | Main Index | Thread Index | Old Index