CVS commit: pkgsrc/audio/mixxx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jul 26 23:35:09 UTC 2019

Modified Files:
        pkgsrc/audio/mixxx: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/mixxx/patches:
            patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp
            patch-vamp-plugins_SConscript

Log Message:
mixxx: Enable support for vamp plugins.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/mixxx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/mixxx/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/mixxx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/mixxx/patches/patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp \
    pkgsrc/audio/mixxx/patches/patch-vamp-plugins_SConscript

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

Modified files:

Index: pkgsrc/audio/mixxx/Makefile
diff -u pkgsrc/audio/mixxx/Makefile:1.4 pkgsrc/audio/mixxx/Makefile:1.5
--- pkgsrc/audio/mixxx/Makefile:1.4     Sat Jul 20 10:39:18 2019
+++ pkgsrc/audio/mixxx/Makefile Fri Jul 26 23:35:09 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/07/20 10:39:18 nia Exp $
+# $NetBSD: Makefile,v 1.5 2019/07/26 23:35:09 nia Exp $
 
 DISTNAME=      mixxx-2.2.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mixxxdj/}
 GITHUB_TAG=    release-${PKGVERSION_NOREV}
@@ -36,7 +36,6 @@ SUBST_VARS.base=      LOCALBASE
 
 SCONS_ARGS+=   faad=1
 SCONS_ARGS+=   modplug=1
-SCONS_ARGS+=   vamp=0 # XXX needs vamp-plugin-sdk update
 
 SCONS_ARGS+=   build="release"
 
@@ -94,6 +93,7 @@ do-install:
 .include "../../audio/rubberband/buildlink3.mk"
 .include "../../audio/soundtouch/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
+.include "../../audio/vamp-plugin-sdk/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.2 pkgsrc/audio/mixxx/PLIST:1.3
--- pkgsrc/audio/mixxx/PLIST:1.2        Sat Jul 20 10:39:18 2019
+++ pkgsrc/audio/mixxx/PLIST    Fri Jul 26 23:35:09 2019
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2019/07/20 10:39:18 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/07/26 23:35:09 nia Exp $
 bin/mixxx
 lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so
 ${PLIST.wavpack}lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
+lib/mixxx/plugins/vampqt5/libmixxxminimal.so
 share/appdata/mixxx.appdata.xml
 share/applications/mixxx.desktop
 share/doc/mixxx/LICENSE

Index: pkgsrc/audio/mixxx/distinfo
diff -u pkgsrc/audio/mixxx/distinfo:1.1 pkgsrc/audio/mixxx/distinfo:1.2
--- pkgsrc/audio/mixxx/distinfo:1.1     Mon Jul  8 16:46:32 2019
+++ pkgsrc/audio/mixxx/distinfo Fri Jul 26 23:35:09 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/07/08 16:46:32 nia Exp $
+$NetBSD: distinfo,v 1.2 2019/07/26 23:35:09 nia Exp $
 
 SHA1 (mixxx-2.2.1.tar.gz) = b6da5dff30c8cdbccd84d55801fcbd67bd337b06
 RMD160 (mixxx-2.2.1.tar.gz) = 919d19785d8ee17ae8cb380ffe8df9ffe30ae93c
@@ -6,7 +6,9 @@ SHA512 (mixxx-2.2.1.tar.gz) = 16f0f4f6a8
 Size (mixxx-2.2.1.tar.gz) = 34763333 bytes
 SHA1 (patch-build_depends.py) = 0025d32ac9c57a65253fd3c59ea04b244b0f3cd4
 SHA1 (patch-build_features.py) = 52471069ffcda271f52cf8d87388ffbf3c1a3dc8
+SHA1 (patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp) = 656f09d146a81ea143af2ddd85cc66392fa3fce8
 SHA1 (patch-src_controllers_controllermanager.cpp) = df7cf07336a6fd511bc09a4253bb409511056938
 SHA1 (patch-src_encoder_encodermp3.cpp) = 2cbd5b4351fe88a6841857817081163ce5c01bb7
 SHA1 (patch-src_util_screensaver.cpp) = da16ba829646298af7a57567894c732ef1ecd53e
 SHA1 (patch-src_util_screensaver.h) = 8bea9c3365219fd52db60f38af4fdcab4be40b81
+SHA1 (patch-vamp-plugins_SConscript) = 91840864b658e2cd9a5cfcb1d9c4f7a35a156824

Added files:

Index: pkgsrc/audio/mixxx/patches/patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp
diff -u /dev/null pkgsrc/audio/mixxx/patches/patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp:1.1
--- /dev/null   Fri Jul 26 23:35:09 2019
+++ pkgsrc/audio/mixxx/patches/patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp    Fri Jul 26 23:35:09 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp,v 1.1 2019/07/26 23:35:09 nia Exp $
+
+Remove silly version checking.
+
+--- lib/vamp/src/vamp-hostsdk/PluginHostAdapter.cpp.orig       2019-04-22 07:50:04.000000000 +0000
++++ lib/vamp/src/vamp-hostsdk/PluginHostAdapter.cpp
+@@ -37,10 +37,6 @@
+ #include <vamp-hostsdk/PluginHostAdapter.h>
+ #include <cstdlib>
+ 
+-#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 7 )
+-#error Unexpected version of Vamp SDK header included
+-#endif
+-
+ _VAMP_SDK_HOSTSPACE_BEGIN(PluginHostAdapter.cpp)
+ 
+ namespace Vamp
Index: pkgsrc/audio/mixxx/patches/patch-vamp-plugins_SConscript
diff -u /dev/null pkgsrc/audio/mixxx/patches/patch-vamp-plugins_SConscript:1.1
--- /dev/null   Fri Jul 26 23:35:09 2019
+++ pkgsrc/audio/mixxx/patches/patch-vamp-plugins_SConscript    Fri Jul 26 23:35:09 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-vamp-plugins_SConscript,v 1.1 2019/07/26 23:35:09 nia Exp $
+
+Correct pkg-config identifier.
+
+--- vamp-plugins/SConscript.orig       2019-04-22 07:50:04.000000000 +0000
++++ vamp-plugins/SConscript
+@@ -54,7 +54,7 @@ if int(build.flags['vamp']):
+     # If there is no system vamp-sdk is installed or if the version
+     # of the installed vamp-sdk is less than the bundled version,
+     # then we'll directly link the bundled vamp-sdk.
+-    if not conf.CheckLib('vamp-sdk') or not conf.CheckForPKG('vamp-plugin-sdk', '2.7.1'):
++    if not conf.CheckLib('vamp-hostsdk') or not conf.CheckForPKG('vamp-sdk', '2.7.1'):
+         INTERNAL_VAMP_PATH = '#lib/vamp'
+         # For header includes
+         env.Append(CPPPATH=[INTERNAL_VAMP_PATH])