Date: Sun, 5 Mar 2017 16:27:12 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435487 - in head/audio/mixxx: . files Message-ID: <201703051627.v25GRCpS054155@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Mar 5 16:27:12 2017 New Revision: 435487 URL: https://svnweb.freebsd.org/changeset/ports/435487 Log: Update to upstream release 2.0.0 PR: 215814 Submitted by: joe@thrallingpenguin.com Reviewed by: riggs Added: head/audio/mixxx/files/patch-build_mixxx.py (contents, props changed) head/audio/mixxx/files/patch-lib_hidapi-0.8.0-rc1_libusb_hid.c (contents, props changed) head/audio/mixxx/files/patch-src_controllers_controllerpresetfilehandler.cpp (contents, props changed) head/audio/mixxx/files/patch-src_musicbrainz_chromaprinter.cpp (contents, props changed) head/audio/mixxx/files/patch-src_upgrade.cpp (contents, props changed) Deleted: head/audio/mixxx/files/patch-build_qt4.py head/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c head/audio/mixxx/files/patch-src_defs.h head/audio/mixxx/files/patch-src_recording_encodermp3.cpp head/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp head/audio/mixxx/files/patch-src_soundmanager.cpp head/audio/mixxx/files/patch-src_soundmanagerconfig.cpp head/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp head/audio/mixxx/files/patch-src_soundsourceproxy.cpp head/audio/mixxx/files/patch-src_widget_wdisplay.cpp Modified: head/audio/mixxx/Makefile head/audio/mixxx/distinfo head/audio/mixxx/files/patch-build_depends.py head/audio/mixxx/files/patch-build_features.py head/audio/mixxx/files/patch-src_controllers_controllermanager.cpp head/audio/mixxx/pkg-plist Modified: head/audio/mixxx/Makefile ============================================================================== --- head/audio/mixxx/Makefile Sun Mar 5 16:27:10 2017 (r435486) +++ head/audio/mixxx/Makefile Sun Mar 5 16:27:12 2017 (r435487) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= mixxx -PORTVERSION= 1.11.0 +PORTVERSION= 2.0.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 15 CATEGORIES= audio MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/ @@ -14,11 +13,14 @@ COMMENT= DJ mixing application LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libFLAC.so:audio/flac \ +LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ + libFLAC.so:audio/flac \ libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad \ 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 @@ -27,18 +29,20 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER BROKEN_aarch64= Fails to compile: Exception("invalid machine type") -USES= scons iconv -USE_QT4= corelib gui network opengl script sql svg xml \ - linguisttools_build moc_build qmake_build rcc_build uic_build -USE_GL= glu -MAKE_ARGS= qtdir="${PREFIX}" optimize=0 +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="${PREFIX}" install_root="${PREFIX}" \ + build=release optimize=native LATE_INSTALL_ARGS= --install-sandbox=${STAGEDIR} PORTDATA= * PORTDOCS= * -OPTIONS_DEFINE= DOCS FAAD GPERFTOOLS LAME SHOUTCAST WAVPACK -OPTIONS_DEFAULT= FAAD SHOUTCAST WAVPACK +OPTIONS_DEFINE= DOCS FAAD GPERFTOOLS HID LAME OPUS SHOUTCAST WAVPACK +OPTIONS_DEFAULT= FAAD HID SHOUTCAST OPUS WAVPACK OPTIONS_SUB= yes FAAD_LIB_DEPENDS= libfaad.so:audio/faad \ @@ -48,7 +52,14 @@ FAAD_MAKE_ARGS_OFF= faad=0 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 @@ -66,7 +77,7 @@ post-patch: ${WRKSRC}/src/SConscript @${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx| ; \ s|^Icon=.*|Icon=${PREFIX}/share/pixmaps/mixxx-icon.png|" \ - ${WRKSRC}/src/mixxx.desktop + ${WRKSRC}/res/linux/mixxx.desktop .for i in midi/midimessage.h qtscript-bytearray/bytearrayclass.h @${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i} .endfor @@ -76,7 +87,7 @@ post-install: @${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.macro +.for i in Mixxx-Manual.pdf README README.md (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ ${STAGEDIR}${DOCSDIR}) .endfor Modified: head/audio/mixxx/distinfo ============================================================================== --- head/audio/mixxx/distinfo Sun Mar 5 16:27:10 2017 (r435486) +++ head/audio/mixxx/distinfo Sun Mar 5 16:27:12 2017 (r435487) @@ -1,2 +1,3 @@ -SHA256 (mixxx-1.11.0-src.tar.gz) = 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 -SIZE (mixxx-1.11.0-src.tar.gz) = 24473835 +TIMESTAMP = 1483555438 +SHA256 (mixxx-2.0.0-src.tar.gz) = e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d +SIZE (mixxx-2.0.0-src.tar.gz) = 25300881 Modified: head/audio/mixxx/files/patch-build_depends.py ============================================================================== --- head/audio/mixxx/files/patch-build_depends.py Sun Mar 5 16:27:10 2017 (r435486) +++ head/audio/mixxx/files/patch-build_depends.py Sun Mar 5 16:27:12 2017 (r435487) @@ -1,113 +1,64 @@ ---- build/depends.py.orig 2013-05-08 23:20:26 UTC +--- build/depends.py.orig 2015-12-29 16:10:41 UTC +++ build/depends.py -@@ -150,7 +150,7 @@ class FLAC(Dependence): +@@ -262,7 +262,7 @@ class Qt(Dependence): - 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): - - # Set Qt include paths for non-OSX - if not build.platform_is_osx: -- include_paths = ['$QTDIR/include/QtCore', -- '$QTDIR/include/QtGui', -- '$QTDIR/include/QtOpenGL', -- '$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') + 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] build.env.Append(CPPPATH=include_paths) + elif build.platform_is_osx: +@@ -358,7 +358,7 @@ class Qt(Dependence): + 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,7 +1045,6 @@ class MixxxCore(Feature): - # Set the rpath for linux/bsd/osx. -@@ -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 - # TODO(XXX) always generate debugging info? -- build.env.Append(CCFLAGS = '-pipe') - build.env.Append(CCFLAGS = '-Wall') - build.env.Append(CCFLAGS = '-Wextra') -- build.env.Append(CCFLAGS = '-g') - -- # Check that g++ is present (yeah, SCONS is a bit dumb here) -- if os.system("which g++ > /dev/null"): #Checks for non-zero return code -- raise Exception("Did not find g++.") - elif build.toolchain_is_msvs: - # Validate the specified winlib directory exists - mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release') -@@ -851,16 +847,19 @@ class MixxxCore(Feature): +- build.env.Append(CCFLAGS='-pipe') + build.env.Append(CCFLAGS='-Wall') + build.env.Append(CCFLAGS='-Wextra') + +@@ -1146,11 +1145,13 @@ class MixxxCore(Feature): elif build.platform_is_bsd: build.env.Append(CPPDEFINES='__BSD__') - build.env.Append(CPPPATH=['/usr/include', - '/usr/local/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']) ++ '%%LOCALBASE%%/include', + '/usr/X11R6/include/']) +- build.env.Append(LIBPATH=['/usr/lib/', +- '/usr/local/lib', + build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2', + '%%LOCALBASE%%/lib/qt4', -+ '%%LOCALBASE%%/lib']) -+ build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/libportaudio.so', -+ '-Wl,-rpath,%%LOCALBASE%%/lib/qt4', -+ '-Wl,-rpath,%%LOCALBASE%%/lib']) ++ '%%LOCALBASE%%/lib', + '/usr/X11R6/lib']) + build.env.Append(LIBS='pthread') # why do we need to do this on OpenBSD and not on Linux? if we - # don't then CheckLib("vorbisfile") fails -- 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): +@@ -1188,7 +1189,7 @@ 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, 'share/mixxx') - build.env.Append(CPPDEFINES=('UNIX_SHARE_PATH', r'\"%s\"' % share_path)) - lib_path = os.path.join(prefix, 'lib/mixxx') - build.env.Append(CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path)) + share_path = os.path.join (prefix, build.env.get( + 'SHAREDIR', default='share'), 'mixxx') + build.env.Append( +@@ -1199,7 +1200,7 @@ class MixxxCore(Feature): + CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path)) def depends(self, build): -- return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt, -+ return [SoundTouch, ReplayGain, PortAudio, Qt, - FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf] +- 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): Modified: head/audio/mixxx/files/patch-build_features.py ============================================================================== --- head/audio/mixxx/files/patch-build_features.py Sun Mar 5 16:27:10 2017 (r435486) +++ head/audio/mixxx/files/patch-build_features.py Sun Mar 5 16:27:12 2017 (r435487) @@ -1,25 +1,25 @@ ---- build/features.py.orig 2013-05-08 23:20:26 UTC +--- build/features.py.orig 2015-12-29 16:10:41 UTC +++ build/features.py -@@ -83,6 +83,9 @@ class HID(Feature): +@@ -87,6 +87,9 @@ class HID(Feature): + raise Exception('Did not find the setupapi library, exiting.') elif build.platform_is_osx: - build.env.Append(LINKFLAGS='-framework IOKit') - build.env.Append(LINKFLAGS='-framework CoreFoundation') + build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation']) + elif build.platform_is_bsd: + conf.CheckLib(['usb', 'libusb']) + conf.CheckLib(['usbhid', 'libusbhid']) - build.env.Append(CPPDEFINES = '__HID__') + build.env.Append(CPPDEFINES='__HID__') -@@ -95,7 +98,7 @@ class HID(Feature): - # Requires setupapi.lib which is included by the above check for +@@ -100,7 +103,7 @@ class HID(Feature): # setupapi. - sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c")) + 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: - sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c')) - elif build.platform_is_osx: - sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c')) -@@ -108,24 +111,27 @@ class Bulk(Feature): + # 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 @@ class Bulk(Feature): def enabled(self, build): # For now only make Bulk default on Linux only. Turn on for all # platforms after the 1.11.0 release. @@ -33,23 +33,28 @@ 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) + vars.Add('bulk', + 'Set to 1 to enable USB Bulk controller support.', is_default) - def configure(self, build, conf): +@@ -132,12 +135,15 @@ class Bulk(Feature): if not self.enabled(build): return -- build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs') +- 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!') +- 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') ++ 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!') ++ 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.env.Append(CPPDEFINES='__BULK__') Added: head/audio/mixxx/files/patch-build_mixxx.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mixxx/files/patch-build_mixxx.py Sun Mar 5 16:27:12 2017 (r435487) @@ -0,0 +1,14 @@ +--- build/mixxx.py.orig 2015-12-29 16:10:41 UTC ++++ build/mixxx.py +@@ -380,9 +380,9 @@ class MixxxBuild(object): + 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'): Added: head/audio/mixxx/files/patch-lib_hidapi-0.8.0-rc1_libusb_hid.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mixxx/files/patch-lib_hidapi-0.8.0-rc1_libusb_hid.c Sun Mar 5 16:27:12 2017 (r435487) @@ -0,0 +1,11 @@ +--- lib/hidapi-0.8.0-rc1/libusb/hid.c.orig 2015-12-29 16:10:41 UTC ++++ lib/hidapi-0.8.0-rc1/libusb/hid.c +@@ -258,7 +258,7 @@ static int get_usage(uint8_t *report_des + Note that the data parameter is Unicode in UTF-16LE encoding. + Return value is the number of bytes in data, or LIBUSB_ERROR_*. + */ +-static inline int libusb_get_string_descriptor(libusb_device_handle *dev, ++inline int libusb_get_string_descriptor(libusb_device_handle *dev, + uint8_t descriptor_index, uint16_t lang_id, + unsigned char *data, int length) + { Modified: head/audio/mixxx/files/patch-src_controllers_controllermanager.cpp ============================================================================== --- head/audio/mixxx/files/patch-src_controllers_controllermanager.cpp Sun Mar 5 16:27:10 2017 (r435486) +++ head/audio/mixxx/files/patch-src_controllers_controllermanager.cpp Sun Mar 5 16:27:12 2017 (r435487) @@ -1,18 +1,7 @@ ---- src/controllers/controllermanager.cpp.orig 2013-05-08 23:20:26 UTC +--- src/controllers/controllermanager.cpp.orig 2015-12-29 16:10:41 UTC +++ src/controllers/controllermanager.cpp -@@ -12,7 +12,10 @@ - #include "controllers/defs_controllers.h" - #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); +@@ -83,7 +83,9 @@ ControllerManager::ControllerManager(Con + m_pMainThreadPresetEnumerator = new PresetInfoEnumerator(presetSearchPaths); // Instantiate all enumerators +#ifdef __PORTMIDI__ Added: head/audio/mixxx/files/patch-src_controllers_controllerpresetfilehandler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mixxx/files/patch-src_controllers_controllerpresetfilehandler.cpp Sun Mar 5 16:27:12 2017 (r435487) @@ -0,0 +1,14 @@ +--- src/controllers/controllerpresetfilehandler.cpp.orig 2015-12-29 16:10:41 UTC ++++ src/controllers/controllerpresetfilehandler.cpp +@@ -43,7 +43,11 @@ ControllerPresetPointer ControllerPreset + 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) { Added: head/audio/mixxx/files/patch-src_musicbrainz_chromaprinter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mixxx/files/patch-src_musicbrainz_chromaprinter.cpp Sun Mar 5 16:27:12 2017 (r435487) @@ -0,0 +1,17 @@ +--- src/musicbrainz/chromaprinter.cpp.orig 2015-12-29 16:10:41 UTC ++++ src/musicbrainz/chromaprinter.cpp +@@ -57,12 +57,12 @@ QString ChromaPrinter::calcFingerPrint(c + } + chromaprint_finish(ctx); + +- void* fprint = NULL; ++ unsigned int* fprint = NULL; + int size = 0; + int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size); + QByteArray fingerprint; + if (ret == 1) { +- void* encoded = NULL; ++ char* encoded = NULL; + int encoded_size = 0; + chromaprint_encode_fingerprint(fprint, size, + CHROMAPRINT_ALGORITHM_DEFAULT, Added: head/audio/mixxx/files/patch-src_upgrade.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mixxx/files/patch-src_upgrade.cpp Sun Mar 5 16:27:12 2017 (r435487) @@ -0,0 +1,11 @@ +--- src/upgrade.cpp.orig 2015-12-29 16:10:41 UTC ++++ src/upgrade.cpp +@@ -43,7 +43,7 @@ Upgrade::~Upgrade() { + + // static + QString Upgrade::mixxx17HomePath() { +-#ifdef __LINUX__ ++#if defined(__LINUX__) || defined(__BSD__) + return QDir::homePath().append("/").append(".mixxx/"); + #elif __WINDOWS__ + return QDir::homePath().append("/").append("Local Settings/Application Data/Mixxx/"); Modified: head/audio/mixxx/pkg-plist ============================================================================== --- head/audio/mixxx/pkg-plist Sun Mar 5 16:27:10 2017 (r435486) +++ head/audio/mixxx/pkg-plist Sun Mar 5 16:27:12 2017 (r435487) @@ -2,5 +2,7 @@ bin/mixxx %%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so %%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so lib/mixxx/plugins/vamp/libmixxxminimal.so +share/appdata/mixxx.appdata.xml share/applications/mixxx.desktop share/pixmaps/mixxx-icon.png +@dir lib/mixxx/plugins/soundsource
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703051627.v25GRCpS054155>