Fri Jul 26 23:35:09 2019 UTC ()
mixxx: Enable support for vamp plugins.

Bump PKGREVISION.


(nia)
diff -r1.4 -r1.5 pkgsrc/audio/mixxx/Makefile
diff -r1.2 -r1.3 pkgsrc/audio/mixxx/PLIST
diff -r1.1 -r1.2 pkgsrc/audio/mixxx/distinfo
diff -r0 -r1.1 pkgsrc/audio/mixxx/patches/patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp
diff -r0 -r1.1 pkgsrc/audio/mixxx/patches/patch-vamp-plugins_SConscript
cvs diff -r1.4 -r1.5 pkgsrc/audio/mixxx/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mixxx/Makefile 2019/07/20 10:39:18 1.4
+++ pkgsrc/audio/mixxx/Makefile 2019/07/26 23:35:09 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2019/07/20 10:39:18 nia Exp $ 1# $NetBSD: Makefile,v 1.5 2019/07/26 23:35:09 nia Exp $
2 2
3DISTNAME= mixxx-2.2.1 3DISTNAME= mixxx-2.2.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mixxxdj/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mixxxdj/}
7GITHUB_TAG= release-${PKGVERSION_NOREV} 7GITHUB_TAG= release-${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://mixxx.org/ 10HOMEPAGE= https://mixxx.org/
11COMMENT= DJ mixing application 11COMMENT= DJ mixing application
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15 15
16USE_LANGUAGES= c c++11 16USE_LANGUAGES= c c++11
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
@@ -26,27 +26,26 @@ PYTHON_VERSIONS_ACCEPTED= 27 @@ -26,27 +26,26 @@ PYTHON_VERSIONS_ACCEPTED= 27
26 26
27CHECK_PORTABILITY_SKIP+= lib/gmock-1.7.0/configure 27CHECK_PORTABILITY_SKIP+= lib/gmock-1.7.0/configure
28 28
29# No support in the build system. 29# No support in the build system.
30BROKEN_ON_PLATFORM+= SunOS-*-* 30BROKEN_ON_PLATFORM+= SunOS-*-*
31 31
32SUBST_CLASSES+= base 32SUBST_CLASSES+= base
33SUBST_STAGE.base= pre-configure 33SUBST_STAGE.base= pre-configure
34SUBST_FILES.base= build/depends.py 34SUBST_FILES.base= build/depends.py
35SUBST_VARS.base= LOCALBASE 35SUBST_VARS.base= LOCALBASE
36 36
37SCONS_ARGS+= faad=1 37SCONS_ARGS+= faad=1
38SCONS_ARGS+= modplug=1 38SCONS_ARGS+= modplug=1
39SCONS_ARGS+= vamp=0 # XXX needs vamp-plugin-sdk update 
40 39
41SCONS_ARGS+= build="release" 40SCONS_ARGS+= build="release"
42 41
43# let pkgsrc take care of this 42# let pkgsrc take care of this
44SCONS_ARGS+= optimize="off" 43SCONS_ARGS+= optimize="off"
45 44
46# XXX horrible workaround 45# XXX horrible workaround
47CXXFLAGS+= -I${QTDIR}/include/QtConcurrent 46CXXFLAGS+= -I${QTDIR}/include/QtConcurrent
48CXXFLAGS+= -I${QTDIR}/include/QtCore 47CXXFLAGS+= -I${QTDIR}/include/QtCore
49CXXFLAGS+= -I${QTDIR}/include/QtDBus 48CXXFLAGS+= -I${QTDIR}/include/QtDBus
50CXXFLAGS+= -I${QTDIR}/include/QtGui 49CXXFLAGS+= -I${QTDIR}/include/QtGui
51CXXFLAGS+= -I${QTDIR}/include/QtNetwork 50CXXFLAGS+= -I${QTDIR}/include/QtNetwork
52CXXFLAGS+= -I${QTDIR}/include/QtOpenGL 51CXXFLAGS+= -I${QTDIR}/include/QtOpenGL
@@ -84,26 +83,27 @@ do-install: @@ -84,26 +83,27 @@ do-install:
84.include "../../audio/libid3tag/buildlink3.mk" 83.include "../../audio/libid3tag/buildlink3.mk"
85.include "../../audio/libmad/buildlink3.mk" 84.include "../../audio/libmad/buildlink3.mk"
86.include "../../audio/libmodplug/buildlink3.mk" 85.include "../../audio/libmodplug/buildlink3.mk"
87.include "../../audio/libshout/buildlink3.mk" 86.include "../../audio/libshout/buildlink3.mk"
88.include "../../audio/libsndfile/buildlink3.mk" 87.include "../../audio/libsndfile/buildlink3.mk"
89.include "../../audio/libvorbis/buildlink3.mk" 88.include "../../audio/libvorbis/buildlink3.mk"
90.include "../../audio/lilv/buildlink3.mk" 89.include "../../audio/lilv/buildlink3.mk"
91.include "../../audio/lv2/buildlink3.mk" 90.include "../../audio/lv2/buildlink3.mk"
92.include "../../audio/opusfile/buildlink3.mk" 91.include "../../audio/opusfile/buildlink3.mk"
93.include "../../audio/portaudio-devel/buildlink3.mk" 92.include "../../audio/portaudio-devel/buildlink3.mk"
94.include "../../audio/rubberband/buildlink3.mk" 93.include "../../audio/rubberband/buildlink3.mk"
95.include "../../audio/soundtouch/buildlink3.mk" 94.include "../../audio/soundtouch/buildlink3.mk"
96.include "../../audio/taglib/buildlink3.mk" 95.include "../../audio/taglib/buildlink3.mk"
 96.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
97.include "../../comms/libhidapi/buildlink3.mk" 97.include "../../comms/libhidapi/buildlink3.mk"
98.include "../../devel/libusb1/buildlink3.mk" 98.include "../../devel/libusb1/buildlink3.mk"
99.include "../../devel/protobuf/buildlink3.mk" 99.include "../../devel/protobuf/buildlink3.mk"
100.include "../../devel/scons/buildlink3.mk" 100.include "../../devel/scons/buildlink3.mk"
101.include "../../graphics/glu/buildlink3.mk" 101.include "../../graphics/glu/buildlink3.mk"
102.include "../../math/fftw/buildlink3.mk" 102.include "../../math/fftw/buildlink3.mk"
103.include "../../multimedia/mp4v2/buildlink3.mk" 103.include "../../multimedia/mp4v2/buildlink3.mk"
104.include "../../sysutils/upower/buildlink3.mk" 104.include "../../sysutils/upower/buildlink3.mk"
105.include "../../x11/qt5-qtbase/buildlink3.mk" 105.include "../../x11/qt5-qtbase/buildlink3.mk"
106.include "../../x11/qt5-qtscript/buildlink3.mk" 106.include "../../x11/qt5-qtscript/buildlink3.mk"
107.include "../../x11/qt5-qtsvg/buildlink3.mk" 107.include "../../x11/qt5-qtsvg/buildlink3.mk"
108.include "../../mk/pthread.buildlink3.mk" 108.include "../../mk/pthread.buildlink3.mk"
109.include "../../mk/bsd.pkg.mk" 109.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/audio/mixxx/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/mixxx/PLIST 2019/07/20 10:39:18 1.2
+++ pkgsrc/audio/mixxx/PLIST 2019/07/26 23:35:09 1.3
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1@comment $NetBSD: PLIST,v 1.2 2019/07/20 10:39:18 nia Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/07/26 23:35:09 nia Exp $
2bin/mixxx 2bin/mixxx
3lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so 3lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so
4${PLIST.wavpack}lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so 4${PLIST.wavpack}lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
 5lib/mixxx/plugins/vampqt5/libmixxxminimal.so
5share/appdata/mixxx.appdata.xml 6share/appdata/mixxx.appdata.xml
6share/applications/mixxx.desktop 7share/applications/mixxx.desktop
7share/doc/mixxx/LICENSE 8share/doc/mixxx/LICENSE
8share/doc/mixxx/Mixxx-Manual.pdf 9share/doc/mixxx/Mixxx-Manual.pdf
9share/doc/mixxx/README 10share/doc/mixxx/README
10share/mixxx/controllers/Akai MPD24.midi.xml 11share/mixxx/controllers/Akai MPD24.midi.xml
11share/mixxx/controllers/Akai-LPD8-RK-scripts.js 12share/mixxx/controllers/Akai-LPD8-RK-scripts.js
12share/mixxx/controllers/Akai-LPD8-RK.midi.xml 13share/mixxx/controllers/Akai-LPD8-RK.midi.xml
13share/mixxx/controllers/Allen and Heath Xone K2.midi.xml 14share/mixxx/controllers/Allen and Heath Xone K2.midi.xml
14share/mixxx/controllers/Allen-and-Heath-Xone-K2-scripts.js 15share/mixxx/controllers/Allen-and-Heath-Xone-K2-scripts.js
15share/mixxx/controllers/American Audio RADIUS 2000 CH1.midi.xml 16share/mixxx/controllers/American Audio RADIUS 2000 CH1.midi.xml
16share/mixxx/controllers/American Audio RADIUS 2000 CH2.midi.xml 17share/mixxx/controllers/American Audio RADIUS 2000 CH2.midi.xml
17share/mixxx/controllers/American Audio VMS2.midi.xml 18share/mixxx/controllers/American Audio VMS2.midi.xml
cvs diff -r1.1 -r1.2 pkgsrc/audio/mixxx/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/mixxx/distinfo 2019/07/08 16:46:32 1.1
+++ pkgsrc/audio/mixxx/distinfo 2019/07/26 23:35:09 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: distinfo,v 1.1 2019/07/08 16:46:32 nia Exp $ 1$NetBSD: distinfo,v 1.2 2019/07/26 23:35:09 nia Exp $
2 2
3SHA1 (mixxx-2.2.1.tar.gz) = b6da5dff30c8cdbccd84d55801fcbd67bd337b06 3SHA1 (mixxx-2.2.1.tar.gz) = b6da5dff30c8cdbccd84d55801fcbd67bd337b06
4RMD160 (mixxx-2.2.1.tar.gz) = 919d19785d8ee17ae8cb380ffe8df9ffe30ae93c 4RMD160 (mixxx-2.2.1.tar.gz) = 919d19785d8ee17ae8cb380ffe8df9ffe30ae93c
5SHA512 (mixxx-2.2.1.tar.gz) = 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3 5SHA512 (mixxx-2.2.1.tar.gz) = 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
6Size (mixxx-2.2.1.tar.gz) = 34763333 bytes 6Size (mixxx-2.2.1.tar.gz) = 34763333 bytes
7SHA1 (patch-build_depends.py) = 0025d32ac9c57a65253fd3c59ea04b244b0f3cd4 7SHA1 (patch-build_depends.py) = 0025d32ac9c57a65253fd3c59ea04b244b0f3cd4
8SHA1 (patch-build_features.py) = 52471069ffcda271f52cf8d87388ffbf3c1a3dc8 8SHA1 (patch-build_features.py) = 52471069ffcda271f52cf8d87388ffbf3c1a3dc8
 9SHA1 (patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp) = 656f09d146a81ea143af2ddd85cc66392fa3fce8
9SHA1 (patch-src_controllers_controllermanager.cpp) = df7cf07336a6fd511bc09a4253bb409511056938 10SHA1 (patch-src_controllers_controllermanager.cpp) = df7cf07336a6fd511bc09a4253bb409511056938
10SHA1 (patch-src_encoder_encodermp3.cpp) = 2cbd5b4351fe88a6841857817081163ce5c01bb7 11SHA1 (patch-src_encoder_encodermp3.cpp) = 2cbd5b4351fe88a6841857817081163ce5c01bb7
11SHA1 (patch-src_util_screensaver.cpp) = da16ba829646298af7a57567894c732ef1ecd53e 12SHA1 (patch-src_util_screensaver.cpp) = da16ba829646298af7a57567894c732ef1ecd53e
12SHA1 (patch-src_util_screensaver.h) = 8bea9c3365219fd52db60f38af4fdcab4be40b81 13SHA1 (patch-src_util_screensaver.h) = 8bea9c3365219fd52db60f38af4fdcab4be40b81
 14SHA1 (patch-vamp-plugins_SConscript) = 91840864b658e2cd9a5cfcb1d9c4f7a35a156824
File Added: pkgsrc/audio/mixxx/patches/Attic/patch-lib_vamp_src_vamp-hostsdk_PluginHostAdapter.cpp
$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
File Added: pkgsrc/audio/mixxx/patches/Attic/patch-vamp-plugins_SConscript
$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])