Attachment #178566 for bug #215814




# $FreeBSD$

PORTNAME=	mixxx
PORTVERSION=	2.0.0
DISTVERSIONSUFFIX=	-src
PORTREVISION=	12
CATEGORIES=	audio
MASTER_SITES=	http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/


LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
		libFLAC.so:audio/flac \
		libid3tag.so:audio/libid3tag \
		libmad.so:audio/libmad \
		libogg.so:audio/libogg \
		libportaudio.so:audio/portaudio \
		librubberband.so:audio/rubberband \
		libsndfile.so:audio/libsndfile \
		libvamp-sdk.so:audio/vamp-plugin-sdk \
		libvorbisfile.so:audio/libvorbis \
		libtag.so:audio/taglib \
		libprotobuf.so:devel/protobuf

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

USES=		scons iconv pkgconfig
USE_QT4=	corelib gui network opengl script scripttools sql svg testlib \
		xml xmlpatterns linguisttools_build moc_build qmake_build \
		rcc_build uic_build
USE_GL=		gl glu
MAKE_ARGS=	qtdir="${QT_PREFIX}" install_root="${PREFIX}" \
		build=release optimize=native
LATE_INSTALL_ARGS=	--install-sandbox=${STAGEDIR}

PORTDATA=	*
PORTDOCS=	*

OPTIONS_DEFINE=		DOCS FAAD GPERFTOOLS HID LAME OPUS SHOUTCAST WAVPACK
OPTIONS_DEFAULT=	FAAD HID OPUS SHOUTCAST WAVPACK
OPTIONS_SUB=		yes

FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \

GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
GPERFTOOLS_MAKE_ARGS=	perftools=1
GPERFTOOLS_MAKE_ARGS_OFF=	perftools=0
HID_DESC=			USB HID controllers support
HID_MAKE_ARGS=		hid=1
HID_MAKE_ARGS_OFF=	hid=0
LAME_RUN_DEPENDS=	lame:audio/lame
OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
		libopusfile.so:audio/opusfile
OPUS_MAKE_ARGS=		opus=1
OPUS_MAKE_ARGS_OFF=	opus=0
SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
SHOUTCAST_MAKE_ARGS=	shoutcast=1
SHOUTCAST_MAKE_ARGS_OFF=	shoutcast=0

		${WRKSRC}/src/SConscript
	@${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx| ; \
		 s|^Icon=.*|Icon=${PREFIX}/share/pixmaps/mixxx-icon.png|" \
		${WRKSRC}/res/linux/mixxx.desktop
.for i in midi/midimessage.h qtscript-bytearray/bytearrayclass.h
	@${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i}
.endfor

	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/*/*.so
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/soundsource
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in Mixxx-Manual.pdf README README.md
	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
		${STAGEDIR}${DOCSDIR})
.endfor

Lines 1-2 Link Here

(-)audio/mixxx/distinfo (-2 / +3 lines)
1	SHA256 (mixxx-1.11.0-src.tar.gz) = 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331	1	TIMESTAMP = 1483555438
2	SIZE (mixxx-1.11.0-src.tar.gz) = 24473835	2	SHA256 (mixxx-2.0.0-src.tar.gz) = e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d
		3	SIZE (mixxx-2.0.0-src.tar.gz) = 25300881




--- build/depends.py.orig	2017-01-04 12:00:54.099408000 -0700
+++ build/depends.py	2017-01-04 14:20:53.368874000 -0700
@@ -262,7 +262,7 @@
 
 class Qt(Dependence):
     DEFAULT_QTDIRS = {'linux': '/usr/share/qt4',
-                      'bsd': '/usr/local/lib/qt4',
+                      'bsd': '%%LOCALBASE%%/lib/qt4',
                       'osx': '/Library/Frameworks',
                       'windows': 'C:\\qt\\4.6.0'}
 
@@ -219,6 +219,7 @@ class Qt(Dependence):
             build.env.Append(LIBS = 'QtOpenGL')
             build.env.Append(LIBS = 'QtXml')
             build.env.Append(LIBS = 'QtNetwork')
+            build.env.Append(LIBS = 'QtSql')
             build.env.Append(LIBS = 'QtScript')
             if use_qtwebkit:
                 build.env.Append(LIBS = 'QtWebKit')
@@ -264,16 +265,16 @@ class Qt(Dependence):
 
         elif build.platform_is_bsd:
             build.env.Append(LIBS=qt_modules)
-            include_paths = ['$QTDIR/include/%s' % module
+            include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
                              for module in qt_modules]
-                             '$QTDIR/include/QtXml',
-                             '$QTDIR/include/QtNetwork',
-                             '$QTDIR/include/QtSql',
-                             '$QTDIR/include/QtScript',
-                             '$QTDIR/include/Qt']
+            include_paths = ['$QTDIR/include/qt4/QtCore',
+                             '$QTDIR/include/qt4/QtGui',
+                             '$QTDIR/include/qt4/QtOpenGL',
+                             '$QTDIR/include/qt4/QtXml',
+                             '$QTDIR/include/qt4/QtNetwork',
+                             '$QTDIR/include/qt4/QtSql',
+                             '$QTDIR/include/qt4/QtScript',
+                             '$QTDIR/include/qt4/Qt']
             if use_qtwebkit:
-                include_paths.append('$QTDIR/include/QtWebKit')
+                include_paths.append('$QTDIR/include/qt4/QtWebKit')
             build.env.Append(CPPPATH=include_paths)
         elif build.platform_is_osx:
@@ -358,7 +358,7 @@
         if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
             qtdir = build.env['QTDIR']
             framework_path = Qt.find_framework_libdir(qtdir, qt5)
-            if os.path.isdir(framework_path):
+            if framework_path and os.path.isdir(framework_path):
                 build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
                 build.env.Append(LINKFLAGS="-L" + framework_path)
 
@@ -1045,12 +1045,11 @@
@@ -387,7 +388,7 @@ class TagLib(Dependence):
         # the files correctly. Adding this folder ot the include path should fix
         # it, though might cause issues. This is safe to remove once we
         # deprecate Karmic support. rryan 2/2011
-        build.env.Append(CPPPATH='/usr/include/taglib/')
+        build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
 
         if build.platform_is_windows and build.static_dependencies:
             build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')
@@ -782,14 +783,9 @@ class MixxxCore(Feature):
         if build.toolchain_is_gnu:
             # Default GNU Options
-            build.env.Append(CCFLAGS='-pipe')
             build.env.Append(CCFLAGS='-Wall')
             build.env.Append(CCFLAGS='-Wextra')
             build.env.Append(CCFLAGS = '-Wextra')
-            build.env.Append(CCFLAGS = '-g')
 
             # Always generate debugging info.
             build.env.Append(CCFLAGS='-g')
-                raise Exception("Did not find g++.")
         elif build.toolchain_is_msvs:
             # Validate the specified winlib directory exists
             mixxx_lib_path = SCons.ARGUMENTS.get(
@@ -1146,11 +1142,13 @@
 
         elif build.platform_is_bsd:
             build.env.Append(CPPDEFINES='__BSD__')
-            build.env.Append(CPPPATH=['/usr/include',
-                                      '/usr/local/include',
+            build.env.Append(CPPPATH=['%%LOCALBASE%%/include/portaudio2',
+                                      '%%LOCALBASE%%/include/qt4',
+                                      '%%LOCALBASE%%/include',
                                       '/usr/X11R6/include/'])
-            build.env.Append(LIBPATH=['/usr/lib/',
-                                      '/usr/local/lib',
-                                      '/usr/X11R6/lib'])
             build.env.Append(LIBS='pthread')
+            build.env.Append(CPPPATH=['%%LOCALBASE%%/include/portaudio2',
+                                      '%%LOCALBASE%%/include/qt4',
+                                      '%%LOCALBASE%%/include'])
+            build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2',
+                                      '%%LOCALBASE%%/lib/qt4',
+                                      '%%LOCALBASE%%/lib',
                                       '/usr/X11R6/lib'])
             build.env.Append(LIBS='pthread')
+                                        '-Wl,-rpath,%%LOCALBASE%%/lib'])
             # why do we need to do this on OpenBSD and not on Linux?  if we
@@ -1188,7 +1186,7 @@
-            build.env.Append(LIBS=['ogg', 'vorbis'])
+            # build.env.Append(LIBS=['ogg', 'vorbis'])
 
         # Define for things that would like to special case UNIX (Linux or BSD)
         if build.platform_is_bsd or build.platform_is_linux:
@@ -897,14 +896,14 @@ class MixxxCore(Feature):
         # Say where to find resources on Unix. TODO(XXX) replace this with a
         # RESOURCE_PATH that covers Win and OSX too:
         if build.platform_is_linux or build.platform_is_bsd:
-            prefix = SCons.ARGUMENTS.get('prefix', '/usr/local')
+            prefix = SCons.ARGUMENTS.get('prefix', '%%PREFIX%%')
             share_path = os.path.join (prefix, build.env.get(
                 'SHAREDIR', default='share'), 'mixxx')
             build.env.Append(
@@ -1199,7 +1197,7 @@
                 CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
 
     def depends(self, build):
-        return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt, TestHeaders,
+        return [SoundTouch, ReplayGain, PortAudio, Qt, TestHeaders,
                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
                 Chromaprint, RubberBand, SecurityFramework, CoreServices, FpClassify]
 
     def post_dependency_check_configure(self, build, conf):




--- build/features.py.orig	2017-01-04 15:27:26.100375000 -0700
+++ build/features.py	2017-01-04 17:15:47.227177000 -0700
@@ -87,6 +87,9 @@
             raise Exception('Did not find the setupapi library, exiting.')
         elif build.platform_is_osx:
             build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
             build.env.Append(LINKFLAGS='-framework CoreFoundation')
+        elif build.platform_is_bsd:
+            conf.CheckLib(['usb', 'libusb'])
+            conf.CheckLib(['usbhid', 'libusbhid'])
 
         build.env.Append(CPPDEFINES='__HID__')
 
@@ -100,7 +103,7 @@
             # Requires setupapi.lib which is included by the above check for
             # setupapi.
             sources.append(
                 os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
-        elif build.platform_is_linux:
+        elif build.platform_is_linux or build.platform_is_bsd:
             # hidapi compiles the libusb implementation by default on Linux
             sources.append(
                 os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
@@ -117,14 +120,14 @@
     def enabled(self, build):
         # For now only make Bulk default on Linux only. Turn on for all
         # platforms after the 1.11.0 release.

     def add_options(self, build, vars):
-        is_default = 1 if build.platform_is_linux else 0
+        is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0
         vars.Add('bulk',
                  'Set to 1 to enable USB Bulk controller support.', is_default)
 
@@ -132,12 +135,15 @@
         if not self.enabled(build):
             return
 
-        build.env.ParseConfig(
-            'pkg-config libusb-1.0 --silence-errors --cflags --libs')
-        if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
-                not conf.CheckHeader('libusb-1.0/libusb.h')):
-            raise Exception(
-                'Did not find the libusb 1.0 development library or its header file, exiting!')
+        if build.platform_is_linux:
+            build.env.ParseConfig(
+                'pkg-config libusb-1.0 --silence-errors --cflags --libs')
+            if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
+                    not conf.CheckHeader('libusb-1.0/libusb.h')):
+                raise Exception(
+                    'Did not find the libusb 1.0 development library or its header file, exiting!')
+        elif build.platform_is_bsd:
+            conf.CheckLib(['usb', 'libusb'])
 
         build.env.Append(CPPDEFINES='__BULK__')
 




--- build/mixxx.py.orig	2017-01-04 16:49:00.854069000 -0700
+++ build/mixxx.py	2017-01-04 16:51:17.073559000 -0700
@@ -380,9 +380,9 @@
             self.env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
 
         # Allow installation directories to be specified.
-        prefix = Script.ARGUMENTS.get('prefix', '/usr/local')
+        prefix = Script.ARGUMENTS.get('prefix', '%%PREFIX%%')
         if os.environ.has_key('LIBDIR'):
-            self.env['LIBDIR'] = os.path.relpath(os.environ['LIBDIR'], prefix)
+            self.env['LIBDIR'] = 'lib' # os.path.relpath(os.environ['LIBDIR'], prefix)
         if os.environ.has_key('BINDIR'):
             self.env['BINDIR'] = os.path.relpath(os.environ['BINDIR'], prefix)
         if os.environ.has_key('SHAREDIR'):




--- build/qt4.py.orig	2013-05-08 23:20:26 UTC
+++ build/qt4.py
@@ -246,8 +246,8 @@ def generate(env):
 	env.Replace(
 #		QTDIR  = _detect(env),
 		QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
-		QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
-		QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
+		QT4_CPPPATH = os.path.join('$QTDIR', 'include', 'qt4', 'Qt'),
+		QT4_LIBPATH = os.path.join('$QTDIR', 'lib', 'qt4'),
 		# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
 		QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
 		QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),




--- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig	2013-05-08 23:20:26 UTC
+++ lib/hidapi-0.8.0-pre/linux/hid-libusb.c
@@ -48,6 +48,12 @@
 
 #include "hidapi.h"
 
+#ifdef __FreeBSD__
+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n)	libusb_get_string_descriptor_ascii(h,i,d,n)
+#else
+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n)	libusb_get_string_descriptor(h,i,l,d,n)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -264,7 +270,7 @@ static uint16_t get_first_language(libus
 	int len;
 	
 	/* Get the string from libusb. */
-	len = libusb_get_string_descriptor(dev,
+	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
 			0x0, /* String ID */
 			0x0, /* Language */
 			(unsigned char*)buf,
@@ -282,7 +288,7 @@ static int is_language_supported(libusb_
 	int i;
 	
 	/* Get the string from libusb. */
-	len = libusb_get_string_descriptor(dev,
+	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
 			0x0, /* String ID */
 			0x0, /* Language */
 			(unsigned char*)buf,
@@ -327,7 +333,7 @@ static wchar_t *get_usb_string(libusb_de
 		lang = get_first_language(dev);
 		
 	/* Get the string from libusb. */
-	len = libusb_get_string_descriptor(dev,
+	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
 			idx,
 			lang,
 			(unsigned char*)buf,

Added Link Here

(-)audio/mixxx/files/patch-lib_hidapi-0.8.0-rc1_libusb_hid.c (+11 lines)
1	--- lib/hidapi-0.8.0-rc1/libusb/hid.c.orig 2017-01-04 17:21:08.071692000 -0700
2	+++ lib/hidapi-0.8.0-rc1/libusb/hid.c 2017-01-04 17:23:31.086619000 -0700
3	@@ -258,7 +258,7 @@
4	Note that the data parameter is Unicode in UTF-16LE encoding.
5	Return value is the number of bytes in data, or LIBUSB_ERROR_*.
6	*/
7	-static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
8	+inline int libusb_get_string_descriptor(libusb_device_handle *dev,
9	uint8_t descriptor_index, uint16_t lang_id,
10	unsigned char *data, int length)
11	{




--- src/controllers/controllermanager.cpp.orig	2017-01-04 15:35:21.942610000 -0700
+++ src/controllers/controllermanager.cpp	2017-01-04 15:36:58.318992000 -0700
@@ -83,7 +83,9 @@
     m_pMainThreadPresetEnumerator = new PresetInfoEnumerator(presetSearchPaths);
 #include "controllers/controllerlearningeventfilter.h"
 
+#ifdef __PORTMIDI__
 #include "controllers/midi/portmidienumerator.h"
+#endif
+
 #ifdef __HSS1394__
     #include "controllers/midi/hss1394enumerator.h"
 #endif
@@ -78,7 +81,9 @@ ControllerManager::ControllerManager(Con
     m_pPresetInfoManager = new PresetInfoEnumerator(m_pConfig);
 
     // Instantiate all enumerators
+#ifdef __PORTMIDI__




--- src/controllers/controllerpresetfilehandler.cpp.orig	2017-01-04 16:12:07.767474000 -0700
+++ src/controllers/controllerpresetfilehandler.cpp	2017-01-04 16:13:24.883734000 -0700
@@ -43,7 +43,11 @@
         pHandler = new MidiControllerPresetFileHandler();
     } else if (scriptPath.endsWith(HID_PRESET_EXTENSION, Qt::CaseInsensitive) ||
                scriptPath.endsWith(BULK_PRESET_EXTENSION, Qt::CaseInsensitive)) {
+#if __HID__
         pHandler = new HidControllerPresetFileHandler();
+#else
+        return ControllerPresetPointer();
+#endif
     }
 
     if (pHandler == NULL) {




--- src/defs.h.orig	2013-05-08 23:20:26 UTC
+++ src/defs.h
@@ -87,6 +87,8 @@ inline double zap_denormal(double x)
 #define math_min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
+#if !defined(__GNUC__)
+
 // MSVC 2005/2008 needs these
 #ifndef fmax
 #define fmax math_max
@@ -98,3 +100,5 @@ inline double zap_denormal(double x)
 
 #endif
 
+#endif
+




--- src/recording/encodermp3.cpp.orig	2013-05-08 23:20:26 UTC
+++ src/recording/encodermp3.cpp
@@ -85,7 +85,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
      */
     QStringList libnames;
     QString libname = "";
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
        libnames << "mp3lame";
 #elif __WINDOWS__
     libnames << "lame_enc.dll";
@@ -108,7 +108,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
         props->setType(DLG_WARNING);
         props->setTitle(tr("Encoder"));
         QString key = "";
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
         key = tr("<html>Mixxx cannot record or stream in MP3 without the MP3 encoder &quot;lame&quot;. Due to licensing issues, we cannot include this with Mixxx. To record or stream in MP3, you must download <b>libmp3lame</b> and install it on your system. <p>See <a href='http://mixxx.org/wiki/doku.php/internet_broadcasting#linux'>Mixxx Wiki</a> for more information. </html>");
         props->setText(key);
 #elif __WINDOWS__




--- src/sounddeviceportaudio.cpp.orig	2013-05-08 23:20:26 UTC
+++ src/sounddeviceportaudio.cpp
@@ -182,10 +182,10 @@ int SoundDevicePortAudio::open()
         qDebug() << "Opened PortAudio stream successfully... starting";
     }
 
-#ifdef __LINUX__
+#if defined(__BSD__) || defined(__LINUX__)
     //Attempt to dynamically load and resolve stuff in the PortAudio library
     //in order to enable RT priority with ALSA.
-    QLibrary portaudio("libportaudio.so.2");
+    QLibrary portaudio("libportaudio.so");
     if (!portaudio.load())
        qWarning() << "Failed to dynamically load PortAudio library";
     else




--- src/soundmanager.cpp.orig	2013-05-08 23:20:26 UTC
+++ src/soundmanager.cpp
@@ -234,7 +234,7 @@ void SoundManager::queryDevices() {
 #ifdef __PORTAUDIO__
     PaError err = paNoError;
     if (!m_paInitialized) {
-#ifdef Q_OS_LINUX
+#if defined(__BSD__) || defined(Q_OS_LINUX)
         setJACKName();
 #endif
         err = Pa_Initialize();
@@ -626,9 +626,9 @@ QList<AudioInput> SoundManager::register
 
 void SoundManager::setJACKName() const {
 #ifdef __PORTAUDIO__
-#ifdef Q_OS_LINUX
+#if defined(__BSD__) || defined(Q_OS_LINUX)
     typedef PaError (*SetJackClientName)(const char *name);
-    QLibrary portaudio("libportaudio.so.2");
+    QLibrary portaudio("libportaudio.so");
     if (portaudio.load()) {
         SetJackClientName func(
             reinterpret_cast<SetJackClientName>(

Removed Link Here

(-)audio/mixxx/files/patch-src_soundmanagerconfig.cpp (-11 lines)
1	--- src/soundmanagerconfig.cpp.orig 2013-05-08 23:20:26 UTC
2	+++ src/soundmanagerconfig.cpp
3	@@ -290,7 +290,7 @@ void SoundManagerConfig::loadDefaults(So
4	if (flags & SoundManagerConfig::API) {
5	QList<QString> apiList = soundManager->getHostAPIList();
6	if (!apiList.isEmpty()) {
7	-#ifdef __LINUX__
8	+#if defined(__BSD__) \|\| defined(__LINUX__)
9	//Check for JACK and use that if it's available, otherwise use ALSA
10	if (apiList.contains(MIXXX_PORTAUDIO_JACK_STRING)) {
11	m_api = MIXXX_PORTAUDIO_JACK_STRING;




--- src/soundsourceoggvorbis.cpp.orig	2013-05-08 23:20:26 UTC
+++ src/soundsourceoggvorbis.cpp
@@ -32,6 +32,15 @@
 #endif
 #endif
 
+#ifdef __BSD__
+#include <sys/endian.h>
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+#define OV_ENDIAN_ARG 0
+#else
+#define OV_ENDIAN_ARG 1
+#endif
+#endif
+
 #ifdef __LINUX__
 #include <endian.h>
 #if __BYTE_ORDER == __LITTLE_ENDIAN

Removed Link Here

(-)audio/mixxx/files/patch-src_soundsourceproxy.cpp (-11 lines)
1	--- src/soundsourceproxy.cpp.orig 2013-05-08 23:20:26 UTC
2	+++ src/soundsourceproxy.cpp
3	@@ -84,7 +84,7 @@ void SoundSourceProxy::loadPlugins()
4	qDebug() << "Adding plugin path from commandline arg:" << pluginPath;
5	pluginDirs.append(QDir(pluginPath));
6	}
7	-#ifdef __LINUX__
8	+#if defined(__BSD__) \|\| defined(__LINUX__)
9	QDir libPath(UNIX_LIB_PATH);
10	if (libPath.cd("plugins") && libPath.cd("soundsource")) {
11	pluginDirs.append(libPath.absolutePath());

Added Link Here

(-)audio/mixxx/files/patch-src_upgrade.cpp (+11 lines)
1	--- src/upgrade.cpp.orig 2015-12-29 09:10:41.000000000 -0700
2	+++ src/upgrade.cpp 2017-01-05 12:58:05.350363000 -0700
3	@@ -43,7 +43,7 @@
4
5	// static
6	QString Upgrade::mixxx17HomePath() {
7	-#ifdef __LINUX__
8	+#if defined(__LINUX__) \|\| defined(__BSD__)
9	return QDir::homePath().append("/").append(".mixxx/");
10	#elif __WINDOWS__
11	return QDir::homePath().append("/").append("Local Settings/Application Data/Mixxx/");

Lines 2-6 Link Here

(-)audio/mixxx/pkg-plist (+1 lines)
2	%%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so	2	%%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so
3	%%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so	3	%%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so
4	lib/mixxx/plugins/vamp/libmixxxminimal.so	4	lib/mixxx/plugins/vamp/libmixxxminimal.so
		5	share/appdata/mixxx.appdata.xml
5	share/applications/mixxx.desktop	6	share/applications/mixxx.desktop
6	share/pixmaps/mixxx-icon.png	7	share/pixmaps/mixxx-icon.png

Return to bug 215814

Lines 2-10 Link Here

(-)audio/mixxx/Makefile (-12 / +24 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mixxx	4	PORTNAME= mixxx
5	PORTVERSION= 1.11.0	5	PORTVERSION= 2.0.0
6	DISTVERSIONSUFFIX= -src	6	DISTVERSIONSUFFIX= -src
7	PORTREVISION= 12
8	CATEGORIES= audio	7	CATEGORIES= audio
9	MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/	8	MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/
10		9
Lines 14-42 Link Here
14	LICENSE= GPLv2+	13	LICENSE= GPLv2+
15	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
16		15
17	LIB_DEPENDS= libFLAC.so:audio/flac \	16	LIB_DEPENDS= libchromaprint.so:audio/chromaprint \
		17	libFLAC.so:audio/flac \
18	libid3tag.so:audio/libid3tag \	18	libid3tag.so:audio/libid3tag \
19	libmad.so:audio/libmad \	19	libmad.so:audio/libmad \
		20	libogg.so:audio/libogg \
20	libportaudio.so:audio/portaudio \	21	libportaudio.so:audio/portaudio \
		22	librubberband.so:audio/rubberband \
21	libsndfile.so:audio/libsndfile \	23	libsndfile.so:audio/libsndfile \
		24	libvamp-sdk.so:audio/vamp-plugin-sdk \
22	libvorbisfile.so:audio/libvorbis \	25	libvorbisfile.so:audio/libvorbis \
23	libtag.so:audio/taglib \	26	libtag.so:audio/taglib \
24	libprotobuf.so:devel/protobuf	27	libprotobuf.so:devel/protobuf
25		28
26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	29	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27		30
28	USES= scons iconv	31	USES= scons iconv pkgconfig
29	USE_QT4= corelib gui network opengl script sql svg xml \	32	USE_QT4= corelib gui network opengl script scripttools sql svg testlib \
30	linguisttools_build moc_build qmake_build rcc_build uic_build	33	xml xmlpatterns linguisttools_build moc_build qmake_build \
31	USE_GL= glu	34	rcc_build uic_build
32	MAKE_ARGS= qtdir="${QT_PREFIX}" optimize=0	35	USE_GL= gl glu
		36	MAKE_ARGS= qtdir="${QT_PREFIX}" install_root="${PREFIX}" \
		37	build=release optimize=native
33	LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR}	38	LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR}
34		39
35	PORTDATA= *	40	PORTDATA= *
36	PORTDOCS= *	41	PORTDOCS= *
37		42
38	OPTIONS_DEFINE= DOCS FAAD GPERFTOOLS LAME SHOUTCAST WAVPACK	43	OPTIONS_DEFINE= DOCS FAAD GPERFTOOLS HID LAME OPUS SHOUTCAST WAVPACK
39	OPTIONS_DEFAULT= FAAD SHOUTCAST WAVPACK	44	OPTIONS_DEFAULT= FAAD HID OPUS SHOUTCAST WAVPACK
40	OPTIONS_SUB= yes	45	OPTIONS_SUB= yes
41		46
42	FAAD_LIB_DEPENDS= libfaad.so:audio/faad \	47	FAAD_LIB_DEPENDS= libfaad.so:audio/faad \
Lines 46-52 Link Here
46	GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools	51	GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools
47	GPERFTOOLS_MAKE_ARGS= perftools=1	52	GPERFTOOLS_MAKE_ARGS= perftools=1
48	GPERFTOOLS_MAKE_ARGS_OFF= perftools=0	53	GPERFTOOLS_MAKE_ARGS_OFF= perftools=0
		54	HID_DESC= USB HID controllers support
		55	HID_MAKE_ARGS= hid=1
		56	HID_MAKE_ARGS_OFF= hid=0
49	LAME_RUN_DEPENDS= lame:audio/lame	57	LAME_RUN_DEPENDS= lame:audio/lame
		58	OPUS_LIB_DEPENDS= libopus.so:audio/opus \
		59	libopusfile.so:audio/opusfile
		60	OPUS_MAKE_ARGS= opus=1
		61	OPUS_MAKE_ARGS_OFF= opus=0
50	SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout	62	SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout
51	SHOUTCAST_MAKE_ARGS= shoutcast=1	63	SHOUTCAST_MAKE_ARGS= shoutcast=1
52	SHOUTCAST_MAKE_ARGS_OFF= shoutcast=0	64	SHOUTCAST_MAKE_ARGS_OFF= shoutcast=0
Lines 64-70 Link Here
64	${WRKSRC}/src/SConscript	76	${WRKSRC}/src/SConscript
65	@${REINPLACE_CMD} -e "s\|^Exec=.*\|Exec=mixxx\| ; \	77	@${REINPLACE_CMD} -e "s\|^Exec=.*\|Exec=mixxx\| ; \
66	s\|^Icon=.*\|Icon=${PREFIX}/share/pixmaps/mixxx-icon.png\|" \	78	s\|^Icon=.*\|Icon=${PREFIX}/share/pixmaps/mixxx-icon.png\|" \
67	${WRKSRC}/src/mixxx.desktop	79	${WRKSRC}/res/linux/mixxx.desktop
68	.for i in midi/midimessage.h qtscript-bytearray/bytearrayclass.h	80	.for i in midi/midimessage.h qtscript-bytearray/bytearrayclass.h
69	@${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i}	81	@${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i}
70	.endfor	82	.endfor
Lines 74-80 Link Here
74	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins//.so	86	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins//.so
75	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/soundsource	87	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/soundsource
76	@${MKDIR} ${STAGEDIR}${DOCSDIR}	88	@${MKDIR} ${STAGEDIR}${DOCSDIR}
77	.for i in Mixxx-Manual.pdf README README.macro	89	.for i in Mixxx-Manual.pdf README README.md
78	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \	90	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
79	${STAGEDIR}${DOCSDIR})	91	${STAGEDIR}${DOCSDIR})
80	.endfor	92	.endfor

Lines 1-113 Link Here

(-)audio/mixxx/files/patch-build_depends.py (-86 / +42 lines)
1	--- build/depends.py.orig 2013-05-08 23:20:26 UTC	1	--- build/depends.py.orig 2017-01-04 12:00:54.099408000 -0700
2	+++ build/depends.py	2	+++ build/depends.py 2017-01-04 14:20:53.368874000 -0700
3	@@ -150,7 +150,7 @@ class FLAC(Dependence):	3	@@ -262,7 +262,7 @@
4
5	class Qt(Dependence):
6	DEFAULT_QTDIRS = {'linux': '/usr/share/qt4',
7	- 'bsd': '/usr/local/lib/qt4',
8	+ 'bsd': '%%LOCALBASE%%/lib/qt4',
9	'osx': '/Library/Frameworks',
10	'windows': 'C:\\qt\\4.6.0'}
11
12	@@ -219,6 +219,7 @@ class Qt(Dependence):
13	build.env.Append(LIBS = 'QtOpenGL')
14	build.env.Append(LIBS = 'QtXml')
15	build.env.Append(LIBS = 'QtNetwork')
16	+ build.env.Append(LIBS = 'QtSql')
17	build.env.Append(LIBS = 'QtScript')
18	if use_qtwebkit:
19	build.env.Append(LIBS = 'QtWebKit')
20	@@ -264,16 +265,16 @@ class Qt(Dependence):
21		4
22	# Set Qt include paths for non-OSX	5	elif build.platform_is_bsd:
23	if not build.platform_is_osx:	6	build.env.Append(LIBS=qt_modules)
24	- include_paths = ['$QTDIR/include/QtCore',	7	- include_paths = ['$QTDIR/include/%s' % module
25	- '$QTDIR/include/QtGui',	8	+ include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
26	- '$QTDIR/include/QtOpenGL',	9	for module in qt_modules]
27	- '$QTDIR/include/QtXml',
28	- '$QTDIR/include/QtNetwork',
29	- '$QTDIR/include/QtSql',
30	- '$QTDIR/include/QtScript',
31	- '$QTDIR/include/Qt']
32	+ include_paths = ['$QTDIR/include/qt4/QtCore',
33	+ '$QTDIR/include/qt4/QtGui',
34	+ '$QTDIR/include/qt4/QtOpenGL',
35	+ '$QTDIR/include/qt4/QtXml',
36	+ '$QTDIR/include/qt4/QtNetwork',
37	+ '$QTDIR/include/qt4/QtSql',
38	+ '$QTDIR/include/qt4/QtScript',
39	+ '$QTDIR/include/qt4/Qt']
40	if use_qtwebkit:
41	- include_paths.append('$QTDIR/include/QtWebKit')
42	+ include_paths.append('$QTDIR/include/qt4/QtWebKit')
43	build.env.Append(CPPPATH=include_paths)	10	build.env.Append(CPPPATH=include_paths)
		11	elif build.platform_is_osx:
		12	@@ -358,7 +358,7 @@
		13	if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
		14	qtdir = build.env['QTDIR']
		15	framework_path = Qt.find_framework_libdir(qtdir, qt5)
		16	- if os.path.isdir(framework_path):
		17	+ if framework_path and os.path.isdir(framework_path):
		18	build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
		19	build.env.Append(LINKFLAGS="-L" + framework_path)
44		20
45	# Set the rpath for linux/bsd/osx.	21	@@ -1045,12 +1045,11 @@
46	@@ -387,7 +388,7 @@ class TagLib(Dependence):
47	# the files correctly. Adding this folder ot the include path should fix
48	# it, though might cause issues. This is safe to remove once we
49	# deprecate Karmic support. rryan 2/2011
50	- build.env.Append(CPPPATH='/usr/include/taglib/')
51	+ build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
52		22
53	if build.platform_is_windows and build.static_dependencies:
54	build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')
55	@@ -782,14 +783,9 @@ class MixxxCore(Feature):
56	if build.toolchain_is_gnu:	23	if build.toolchain_is_gnu:
57	# Default GNU Options	24	# Default GNU Options
58	# TODO(XXX) always generate debugging info?	25	- build.env.Append(CCFLAGS='-pipe')
59	- build.env.Append(CCFLAGS = '-pipe')	26	build.env.Append(CCFLAGS='-Wall')
60	build.env.Append(CCFLAGS = '-Wall')	27	build.env.Append(CCFLAGS='-Wextra')
61	build.env.Append(CCFLAGS = '-Wextra')
62	- build.env.Append(CCFLAGS = '-g')
63		28
64	- # Check that g++ is present (yeah, SCONS is a bit dumb here)	29	# Always generate debugging info.
65	- if os.system("which g++ > /dev/null"): #Checks for non-zero return code	30	build.env.Append(CCFLAGS='-g')
66	- raise Exception("Did not find g++.")
67	elif build.toolchain_is_msvs:	31	elif build.toolchain_is_msvs:
68	# Validate the specified winlib directory exists	32	# Validate the specified winlib directory exists
69	mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release')	33	mixxx_lib_path = SCons.ARGUMENTS.get(
70	@@ -851,16 +847,19 @@ class MixxxCore(Feature):	34	@@ -1146,11 +1142,13 @@
71		35
72	elif build.platform_is_bsd:	36	elif build.platform_is_bsd:
73	build.env.Append(CPPDEFINES='__BSD__')	37	build.env.Append(CPPDEFINES='__BSD__')
74	- build.env.Append(CPPPATH=['/usr/include',	38	- build.env.Append(CPPPATH=['/usr/include',
75	- '/usr/local/include',	39	- '/usr/local/include',
76	- '/usr/X11R6/include/'])	40	+ build.env.Append(CPPPATH=['%%LOCALBASE%%/include/portaudio2',
		41	+ '%%LOCALBASE%%/include/qt4',
		42	+ '%%LOCALBASE%%/include',
		43	'/usr/X11R6/include/'])
77	- build.env.Append(LIBPATH=['/usr/lib/',	44	- build.env.Append(LIBPATH=['/usr/lib/',
78	- '/usr/local/lib',	45	- '/usr/local/lib',
79	- '/usr/X11R6/lib'])
80	build.env.Append(LIBS='pthread')
81	+ build.env.Append(CPPPATH=['%%LOCALBASE%%/include/portaudio2',
82	+ '%%LOCALBASE%%/include/qt4',
83	+ '%%LOCALBASE%%/include'])
84	+ build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2',	46	+ build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2',
85	+ '%%LOCALBASE%%/lib/qt4',	47	+ '%%LOCALBASE%%/lib/qt4',
86	+ '%%LOCALBASE%%/lib'])	48	+ '%%LOCALBASE%%/lib',
87	+ build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/libportaudio.so',	49	'/usr/X11R6/lib'])
88	+ '-Wl,-rpath,%%LOCALBASE%%/lib/qt4',	50	build.env.Append(LIBS='pthread')
89	+ '-Wl,-rpath,%%LOCALBASE%%/lib'])
90	# why do we need to do this on OpenBSD and not on Linux? if we	51	# why do we need to do this on OpenBSD and not on Linux? if we
91	# don't then CheckLib("vorbisfile") fails	52	@@ -1188,7 +1186,7 @@
92	- build.env.Append(LIBS=['ogg', 'vorbis'])
93	+ # build.env.Append(LIBS=['ogg', 'vorbis'])
94
95	# Define for things that would like to special case UNIX (Linux or BSD)
96	if build.platform_is_bsd or build.platform_is_linux:
97	@@ -897,14 +896,14 @@ class MixxxCore(Feature):
98	# Say where to find resources on Unix. TODO(XXX) replace this with a	53	# Say where to find resources on Unix. TODO(XXX) replace this with a
99	# RESOURCE_PATH that covers Win and OSX too:	54	# RESOURCE_PATH that covers Win and OSX too:
100	if build.platform_is_linux or build.platform_is_bsd:	55	if build.platform_is_linux or build.platform_is_bsd:
101	- prefix = SCons.ARGUMENTS.get('prefix', '/usr/local')	56	- prefix = SCons.ARGUMENTS.get('prefix', '/usr/local')
102	+ prefix = SCons.ARGUMENTS.get('prefix', '%%PREFIX%%')	57	+ prefix = SCons.ARGUMENTS.get('prefix', '%%PREFIX%%')
103	share_path = os.path.join(prefix, 'share/mixxx')	58	share_path = os.path.join (prefix, build.env.get(
104	build.env.Append(CPPDEFINES=('UNIX_SHARE_PATH', r'\"%s\"' % share_path))	59	'SHAREDIR', default='share'), 'mixxx')
105	lib_path = os.path.join(prefix, 'lib/mixxx')	60	build.env.Append(
106	build.env.Append(CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))	61	@@ -1199,7 +1197,7 @@
		62	CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
107		63
108	def depends(self, build):	64	def depends(self, build):
109	- return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt,	65	- return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt, TestHeaders,
110	+ return [SoundTouch, ReplayGain, PortAudio, Qt,	66	+ return [SoundTouch, ReplayGain, PortAudio, Qt, TestHeaders,
111	FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf]	67	FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
		68	Chromaprint, RubberBand, SecurityFramework, CoreServices, FpClassify]
112		69
113	def post_dependency_check_configure(self, build, conf):

Lines 1-25 Link Here

(-)audio/mixxx/files/patch-build_features.py (-22 / +27 lines)
1	--- build/features.py.orig 2013-05-08 23:20:26 UTC	1	--- build/features.py.orig 2017-01-04 15:27:26.100375000 -0700
2	+++ build/features.py	2	+++ build/features.py 2017-01-04 17:15:47.227177000 -0700
3	@@ -83,6 +83,9 @@ class HID(Feature):	3	@@ -87,6 +87,9 @@
		4	raise Exception('Did not find the setupapi library, exiting.')
4	elif build.platform_is_osx:	5	elif build.platform_is_osx:
5	build.env.Append(LINKFLAGS='-framework IOKit')	6	build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
6	build.env.Append(LINKFLAGS='-framework CoreFoundation')
7	+ elif build.platform_is_bsd:	7	+ elif build.platform_is_bsd:
8	+ conf.CheckLib(['usb', 'libusb'])	8	+ conf.CheckLib(['usb', 'libusb'])
9	+ conf.CheckLib(['usbhid', 'libusbhid'])	9	+ conf.CheckLib(['usbhid', 'libusbhid'])
10		10
11	build.env.Append(CPPDEFINES = '__HID__')	11	build.env.Append(CPPDEFINES='__HID__')
12		12
13	@@ -95,7 +98,7 @@ class HID(Feature):	13	@@ -100,7 +103,7 @@
14	# Requires setupapi.lib which is included by the above check for
15	# setupapi.	14	# setupapi.
16	sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))	15	sources.append(
		16	os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
17	- elif build.platform_is_linux:	17	- elif build.platform_is_linux:
18	+ elif build.platform_is_linux or build.platform_is_bsd:	18	+ elif build.platform_is_linux or build.platform_is_bsd:
19	sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))	19	# hidapi compiles the libusb implementation by default on Linux
20	elif build.platform_is_osx:	20	sources.append(
21	sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))	21	os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
22	@@ -108,24 +111,27 @@ class Bulk(Feature):	22	@@ -117,14 +120,14 @@
23	def enabled(self, build):	23	def enabled(self, build):
24	# For now only make Bulk default on Linux only. Turn on for all	24	# For now only make Bulk default on Linux only. Turn on for all
25	# platforms after the 1.11.0 release.	25	# platforms after the 1.11.0 release.
Lines 33-55 Link Here
33	def add_options(self, build, vars):	33	def add_options(self, build, vars):
34	- is_default = 1 if build.platform_is_linux else 0	34	- is_default = 1 if build.platform_is_linux else 0
35	+ is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0	35	+ is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0
36	vars.Add('bulk', 'Set to 1 to enable USB Bulk controller support.', is_default)	36	vars.Add('bulk',
		37	'Set to 1 to enable USB Bulk controller support.', is_default)
37		38
38	def configure(self, build, conf):	39	@@ -132,12 +135,15 @@
39	if not self.enabled(build):	40	if not self.enabled(build):
40	return	41	return
41		42
42	- build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')	43	- build.env.ParseConfig(
		44	- 'pkg-config libusb-1.0 --silence-errors --cflags --libs')
43	- if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or	45	- if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
44	- not conf.CheckHeader('libusb-1.0/libusb.h')):	46	- not conf.CheckHeader('libusb-1.0/libusb.h')):
45	- raise Exception('Did not find the libusb 1.0 development library or its header file, exiting!')	47	- raise Exception(
		48	- 'Did not find the libusb 1.0 development library or its header file, exiting!')
46	+ if build.platform_is_linux:	49	+ if build.platform_is_linux:
47	+ build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')	50	+ build.env.ParseConfig(
		51	+ 'pkg-config libusb-1.0 --silence-errors --cflags --libs')
48	+ if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or	52	+ if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
49	+ not conf.CheckHeader('libusb-1.0/libusb.h')):	53	+ not conf.CheckHeader('libusb-1.0/libusb.h')):
50	+ raise Exception('Did not find the libusb 1.0 development library or its header file, exiting!')	54	+ raise Exception(
		55	+ 'Did not find the libusb 1.0 development library or its header file, exiting!')
51	+ elif build.platform_is_bsd:	56	+ elif build.platform_is_bsd:
52	+ conf.CheckLib(['usb', 'libusb'])	57	+ conf.CheckLib(['usb', 'libusb'])
53		58
54	build.env.Append(CPPDEFINES = '__BULK__')	59	build.env.Append(CPPDEFINES='__BULK__')
55		60

Added Link Here

(-)audio/mixxx/files/patch-build_mixxx.py (+14 lines)
1	--- build/mixxx.py.orig 2017-01-04 16:49:00.854069000 -0700
2	+++ build/mixxx.py 2017-01-04 16:51:17.073559000 -0700
3	@@ -380,9 +380,9 @@
4	self.env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
5
6	# Allow installation directories to be specified.
7	- prefix = Script.ARGUMENTS.get('prefix', '/usr/local')
8	+ prefix = Script.ARGUMENTS.get('prefix', '%%PREFIX%%')
9	if os.environ.has_key('LIBDIR'):
10	- self.env['LIBDIR'] = os.path.relpath(os.environ['LIBDIR'], prefix)
11	+ self.env['LIBDIR'] = 'lib' # os.path.relpath(os.environ['LIBDIR'], prefix)
12	if os.environ.has_key('BINDIR'):
13	self.env['BINDIR'] = os.path.relpath(os.environ['BINDIR'], prefix)
14	if os.environ.has_key('SHAREDIR'):

Removed Link Here

(-)audio/mixxx/files/patch-build_qt4.py (-13 lines)
1	--- build/qt4.py.orig 2013-05-08 23:20:26 UTC
2	+++ build/qt4.py
3	@@ -246,8 +246,8 @@ def generate(env):
4	env.Replace(
5	# QTDIR = _detect(env),
6	QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
7	- QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
8	- QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
9	+ QT4_CPPPATH = os.path.join('$QTDIR', 'include', 'qt4', 'Qt'),
10	+ QT4_LIBPATH = os.path.join('$QTDIR', 'lib', 'qt4'),
11	# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
12	QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
13	QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),

Removed Link Here

(-)audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c (-42 lines)
1	--- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig 2013-05-08 23:20:26 UTC
2	+++ lib/hidapi-0.8.0-pre/linux/hid-libusb.c
3	@@ -48,6 +48,12 @@
4
5	#include "hidapi.h"
6
7	+#ifdef __FreeBSD__
8	+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n) libusb_get_string_descriptor_ascii(h,i,d,n)
9	+#else
10	+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n) libusb_get_string_descriptor(h,i,l,d,n)
11	+#endif
12	+
13	#ifdef __cplusplus
14	extern "C" {
15	#endif
16	@@ -264,7 +270,7 @@ static uint16_t get_first_language(libus
17	int len;
18
19	/* Get the string from libusb. */
20	- len = libusb_get_string_descriptor(dev,
21	+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
22	0x0, /* String ID */
23	0x0, /* Language */
24	(unsigned char*)buf,
25	@@ -282,7 +288,7 @@ static int is_language_supported(libusb_
26	int i;
27
28	/* Get the string from libusb. */
29	- len = libusb_get_string_descriptor(dev,
30	+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
31	0x0, /* String ID */
32	0x0, /* Language */
33	(unsigned char*)buf,
34	@@ -327,7 +333,7 @@ static wchar_t *get_usb_string(libusb_de
35	lang = get_first_language(dev);
36
37	/* Get the string from libusb. */
38	- len = libusb_get_string_descriptor(dev,
39	+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
40	idx,
41	lang,
42	(unsigned char*)buf,

Lines 1-18 Link Here

(-)audio/mixxx/files/patch-src_controllers_controllermanager.cpp (-15 / +4 lines)
1	--- src/controllers/controllermanager.cpp.orig 2013-05-08 23:20:26 UTC	1	--- src/controllers/controllermanager.cpp.orig 2017-01-04 15:35:21.942610000 -0700
2	+++ src/controllers/controllermanager.cpp	2	+++ src/controllers/controllermanager.cpp 2017-01-04 15:36:58.318992000 -0700
3	@@ -12,7 +12,10 @@	3	@@ -83,7 +83,9 @@
4	#include "controllers/defs_controllers.h"	4	m_pMainThreadPresetEnumerator = new PresetInfoEnumerator(presetSearchPaths);
5	#include "controllers/controllerlearningeventfilter.h"
6
7	+#ifdef __PORTMIDI__
8	#include "controllers/midi/portmidienumerator.h"
9	+#endif
10	+
11	#ifdef __HSS1394__
12	#include "controllers/midi/hss1394enumerator.h"
13	#endif
14	@@ -78,7 +81,9 @@ ControllerManager::ControllerManager(Con
15	m_pPresetInfoManager = new PresetInfoEnumerator(m_pConfig);
16		5
17	// Instantiate all enumerators	6	// Instantiate all enumerators
18	+#ifdef __PORTMIDI__	7	+#ifdef __PORTMIDI__

Added Link Here

(-)audio/mixxx/files/patch-src_controllers_controllerpresetfilehandler.cpp (+14 lines)
1	--- src/controllers/controllerpresetfilehandler.cpp.orig 2017-01-04 16:12:07.767474000 -0700
2	+++ src/controllers/controllerpresetfilehandler.cpp 2017-01-04 16:13:24.883734000 -0700
3	@@ -43,7 +43,11 @@
4	pHandler = new MidiControllerPresetFileHandler();
5	} else if (scriptPath.endsWith(HID_PRESET_EXTENSION, Qt::CaseInsensitive) \|\|
6	scriptPath.endsWith(BULK_PRESET_EXTENSION, Qt::CaseInsensitive)) {
7	+#if __HID__
8	pHandler = new HidControllerPresetFileHandler();
9	+#else
10	+ return ControllerPresetPointer();
11	+#endif
12	}
13
14	if (pHandler == NULL) {

Removed Link Here

(-)audio/mixxx/files/patch-src_defs.h (-17 lines)
1	--- src/defs.h.orig 2013-05-08 23:20:26 UTC
2	+++ src/defs.h
3	@@ -87,6 +87,8 @@ inline double zap_denormal(double x)
4	#define math_min(a,b) (((a) < (b)) ? (a) : (b))
5	#endif
6
7	+#if !defined(__GNUC__)
8	+
9	// MSVC 2005/2008 needs these
10	#ifndef fmax
11	#define fmax math_max
12	@@ -98,3 +100,5 @@ inline double zap_denormal(double x)
13
14	#endif
15
16	+#endif
17	+

Removed Link Here

(-)audio/mixxx/files/patch-src_recording_encodermp3.cpp (-20 lines)
1	--- src/recording/encodermp3.cpp.orig 2013-05-08 23:20:26 UTC
2	+++ src/recording/encodermp3.cpp
3	@@ -85,7 +85,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
4	*/
5	QStringList libnames;
6	QString libname = "";
7	-#ifdef __LINUX__
8	+#if defined(__BSD__) \|\| defined(__LINUX__)
9	libnames << "mp3lame";
10	#elif __WINDOWS__
11	libnames << "lame_enc.dll";
12	@@ -108,7 +108,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
13	props->setType(DLG_WARNING);
14	props->setTitle(tr("Encoder"));
15	QString key = "";
16	-#ifdef __LINUX__
17	+#if defined(__BSD__) \|\| defined(__LINUX__)
18	key = tr("<html>Mixxx cannot record or stream in MP3 without the MP3 encoder "lame". Due to licensing issues, we cannot include this with Mixxx. To record or stream in MP3, you must download <b>libmp3lame</b> and install it on your system. <p>See <a href='http://mixxx.org/wiki/doku.php/internet_broadcasting#linux'>Mixxx Wiki</a> for more information. </html>");
19	props->setText(key);
20	#elif __WINDOWS__

Removed Link Here

(-)audio/mixxx/files/patch-src_sounddeviceportaudio.cpp (-15 lines)
1	--- src/sounddeviceportaudio.cpp.orig 2013-05-08 23:20:26 UTC
2	+++ src/sounddeviceportaudio.cpp
3	@@ -182,10 +182,10 @@ int SoundDevicePortAudio::open()
4	qDebug() << "Opened PortAudio stream successfully... starting";
5	}
6
7	-#ifdef __LINUX__
8	+#if defined(__BSD__) \|\| defined(__LINUX__)
9	//Attempt to dynamically load and resolve stuff in the PortAudio library
10	//in order to enable RT priority with ALSA.
11	- QLibrary portaudio("libportaudio.so.2");
12	+ QLibrary portaudio("libportaudio.so");
13	if (!portaudio.load())
14	qWarning() << "Failed to dynamically load PortAudio library";
15	else

Removed Link Here

(-)audio/mixxx/files/patch-src_soundmanager.cpp (-23 lines)
1	--- src/soundmanager.cpp.orig 2013-05-08 23:20:26 UTC
2	+++ src/soundmanager.cpp
3	@@ -234,7 +234,7 @@ void SoundManager::queryDevices() {
4	#ifdef __PORTAUDIO__
5	PaError err = paNoError;
6	if (!m_paInitialized) {
7	-#ifdef Q_OS_LINUX
8	+#if defined(__BSD__) \|\| defined(Q_OS_LINUX)
9	setJACKName();
10	#endif
11	err = Pa_Initialize();
12	@@ -626,9 +626,9 @@ QList<AudioInput> SoundManager::register
13
14	void SoundManager::setJACKName() const {
15	#ifdef __PORTAUDIO__
16	-#ifdef Q_OS_LINUX
17	+#if defined(__BSD__) \|\| defined(Q_OS_LINUX)
18	typedef PaError (SetJackClientName)(const char name);
19	- QLibrary portaudio("libportaudio.so.2");
20	+ QLibrary portaudio("libportaudio.so");
21	if (portaudio.load()) {
22	SetJackClientName func(
23	reinterpret_cast<SetJackClientName>(

Removed Link Here

(-)audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp (-18 lines)
1	--- src/soundsourceoggvorbis.cpp.orig 2013-05-08 23:20:26 UTC
2	+++ src/soundsourceoggvorbis.cpp
3	@@ -32,6 +32,15 @@
4	#endif
5	#endif
6
7	+#ifdef __BSD__
8	+#include <sys/endian.h>
9	+#if _BYTE_ORDER == _LITTLE_ENDIAN
10	+#define OV_ENDIAN_ARG 0
11	+#else
12	+#define OV_ENDIAN_ARG 1
13	+#endif
14	+#endif
15	+
16	#ifdef __LINUX__
17	#include <endian.h>
18	#if __BYTE_ORDER == __LITTLE_ENDIAN