From a833e3f4a431b8eea751b7420e127787f9c92117 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Dec 2017 12:06:33 +0000 Subject: gentoo resync : 04.12.2017 --- media-sound/mixxx/Manifest | 6 - media-sound/mixxx/files/mixxx-1.10.0-cflags.patch | 13 -- media-sound/mixxx/files/mixxx-1.10.0-docs.patch | 10 - media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch | 37 ---- .../mixxx/files/mixxx-1.10.0-system-libs.patch | 172 ---------------- media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch | 35 ---- .../mixxx/files/mixxx-1.11.0-system-libs.patch | 223 --------------------- 7 files changed, 496 deletions(-) delete mode 100644 media-sound/mixxx/files/mixxx-1.10.0-cflags.patch delete mode 100644 media-sound/mixxx/files/mixxx-1.10.0-docs.patch delete mode 100644 media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch delete mode 100644 media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch delete mode 100644 media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch delete mode 100644 media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch (limited to 'media-sound/mixxx') diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index 42e1c5eab82c..90c0f642a9e4 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -1,9 +1,3 @@ -AUX mixxx-1.10.0-cflags.patch 573 BLAKE2B 15bb22bd2ae0c1f805a6279d6a488e81ed6aa5889ceceb0c03962c782e49422625337c3432b5528b857702ddabf0a296d5ae796b51e6ec2736fdafacaf9f4232 SHA512 1157161dc85314da07c47f5b42b654d5391ca3b84412f10915b5d15a9fe6cc0dbbf06f7e3156cb2f9cf21f0233ee50ae7e54cb10855332f0292b3bba915f857a -AUX mixxx-1.10.0-docs.patch 327 BLAKE2B a40531618e0b51543c3f18f14c71b328cbb577a8172a8b42e40f0cc1fcbb5f8f6a78bbcaad812ee09ea252ba8ff28fc300486265f270ad9ad0f8d80aa2f42e9a SHA512 c785cab9ba558d5f4df04e6f89515a2056e2db84767061d0f0e1fa140fd419c384d49d78dae913e31663da4b8680a0ea966414be2c9309d4da5c2ba0dddadcc1 -AUX mixxx-1.10.0-no-bzr.patch 1503 BLAKE2B 50780142ca9611fa107fbd70627b9ab43d147f330ed3319aa0bc7f98ce22a5b1183a49841b33cda4115e4232ee81f407e311a0ad10ebbddca699ce68de295364 SHA512 faeedcdaa29ed6939b22ed6e60a8493c8d76f45904287667b4c7aa1b2e9acaa43810b005ad5d31eafb466e1717d18f773929ee41a9ab0e6c5c39b33fd07d8d59 -AUX mixxx-1.10.0-system-libs.patch 7152 BLAKE2B 9cacbf25c1919c3bc01d97bdb8b38d77760d65ffee40f8950fe226afcd1fb3bec0c419f39124b425800eedc244381d09d4e9ac6fda3ea892f2bec74e6fd1220a SHA512 18d47f0a68c9cd333ebd719e58421db27df15e9babd913750907d2a725236c6a7ad90b7c2a67b6b746d14f94676e746db0f2dcce80af09c02b0d762d6eb7d2b8 -AUX mixxx-1.11.0-no-bzr.patch 1390 BLAKE2B 2cf4ac3097c96d1f51f5623e8d0550cb58ecc45ce00cca801e76163eb7e80ec31929c6df15700b86ba29314606d1d619cd086f8c4f4c21d52ef9145c8b9c0bf5 SHA512 65f78fcb4c653b93d5ff0a308bca5ec16d0ccdd367e0ac8b15ca1d908aaee332316770cf6b11b2452b2ef8dfe44babd20fd60d58d2fca4cf794073601f6667bb -AUX mixxx-1.11.0-system-libs.patch 8877 BLAKE2B 70bc82a5396abc6192f438ccd5278deca2e83c15d26dc60bfbe6c4a44228a0ffb8d7f6c2044b62a0c45fa6b72eb063cfc21771c0ff679de6f3be93f553d1084b SHA512 baabba8c7c873bfe5da4230f13787133b69ee72b83328b41e7eb4ade5d81350765309ae9be8154d93aeb9e7e1f90ef0ac2d8a20153d0600d41173d876d51331f AUX mixxx-2.0.0-chromaprint-1.4.patch 1518 BLAKE2B ead525e69d7c031b81aa00f969a1e569182eb958d794a6715d809d46dc8d5789b71e7d4dbd8a6ce8987013d614f3fd1b4b0a63fa488c7e2f48136614c3bafea8 SHA512 31da87b64646188be144611fc6f601d58edfcf9e63b5382060f5088797c24d61ff4b48a4e80c5c3b919b7291287d3977c0f61829ddfe7a43f9fbae7db3b735c0 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59 AUX mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch 1615 BLAKE2B 08a41664f1941ac100b8fbee0c92e064813f0eb549cfd17e766541034954c73ea8b5ca9c759d98edb1f3513447719313790000c92f47c53ef54e0b74fe8c7f6c SHA512 825599d1bdfbcc673c64226bde25f2ae56b046d32139c3347cb2aae698aa27158b17609dd097ce772e62bcd58b7f711d352386069683239541f3f4160dc6d915 diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch deleted file mode 100644 index b6c8655a73a6..000000000000 --- a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- mixxx-1.10.0/build/depends.py -+++ mixxx-1.10.0/build/depends.py -@@ -623,10 +555,8 @@ - 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 diff --git a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch deleted file mode 100644 index c9205179881c..000000000000 --- a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mixxx-1.10.0/src/SConscript -+++ mixxx-1.10.0/src/SConscript -@@ -219,7 +218,6 @@ - env.Alias('install', keyboardmappings) - if int(flags['ladspa']): - env.Alias('install', ladspapresets) -- env.Alias('install', docs) - env.Alias('install', dotdesktop) - env.Alias('install', icon) - env.Alias('install', promotracks) diff --git a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch deleted file mode 100644 index 40f32266bb5e..000000000000 --- a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mixxx-1.10.0/src/SConscript.env -+++ mixxx-1.10.0/src/SConscript.env -@@ -19,21 +19,6 @@ - print "Deleting deprecated build file: %s" % defs - os.remove(defs) - --#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun --## instead, embed BZR version into build --## Put version info into a file, so it doesn't force a rebuild of everything :) --f = open("build.h","w") --try: -- branch_name = util.get_bzr_branch_name() -- modified = util.get_bzr_modified() > 0 -- # Do not emit BUILD_BRANCH on release branches. -- if not branch_name.startswith('release'): -- f.write('#define BUILD_BRANCH "%s"\n' % branch_name) -- f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(), -- '+' if modified else '')) --finally: -- f.close() -- - #Check for dependencies if we're not doing a clean... - #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']): - conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig, ---- mixxx-1.10.0/src/SConscript -+++ mixxx-1.10.0/src/SConscript -@@ -12,8 +12,8 @@ - from build import util - - mixxx_version = util.get_mixxx_version() --branch_name = util.get_bzr_branch_name() --bazaar_revision = util.get_bzr_revision() -+#branch_name = util.get_bzr_branch_name() -+#bazaar_revision = util.get_bzr_revision() - print "WE ARE IN:", os.getcwd() - - plugins = [] diff --git a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch deleted file mode 100644 index d2e21f3e005b..000000000000 --- a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch +++ /dev/null @@ -1,172 +0,0 @@ ---- mixxx-1.10.0/build/depends.py -+++ mixxx-1.10.0/build/depends.py -@@ -21,7 +21,7 @@ - - def configure(self, build, conf): - #Check for PortTime -- if not conf.CheckLib(['porttime', 'libporttime']) and \ -+ if not conf.CheckLib(['porttime', 'libportmidi']) and \ - not conf.CheckHeader(['porttime.h']): - raise Exception("Did not find PortTime or its development headers.") - if not conf.CheckLib(['portmidi', 'libportmidi']) and \ -@@ -189,25 +189,10 @@ - - class FidLib(Dependence): - -- def sources(self, build): -- symbol = None -- if build.platform_is_windows: -- if build.toolchain_is_msvs: -- symbol = 'T_MSVC' -- elif build.crosscompile: -- # Not sure why, but fidlib won't build with mingw32msvc and -- # T_MINGW -- symbol = 'T_LINUX' -- elif build.toolchain_is_gnu: -- symbol = 'T_MINGW' -- else: -- symbol = 'T_LINUX' -- -- return [build.env.StaticObject('#lib/fidlib-0.9.9/fidlib.c', -- CPPDEFINES=symbol)] -- - def configure(self, build, conf): -- build.env.Append(CPPPATH='#lib/fidlib-0.9.9/') -+ if not conf.CheckLib('fidlib'): -+ raise Exception('Did not find fidlib library, exiting!') -+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib']) - - class KissFFT(Dependence): - -@@ -226,68 +211,15 @@ - build.env.Append(CPPPATH="#lib/replaygain") - - class SoundTouch(Dependence): -- SOUNDTOUCH_PATH = 'soundtouch-1.5.0' - - def sources(self, build): -- sources = ['engine/enginebufferscalest.cpp', -- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH] -- if build.platform_is_windows and build.toolchain_is_msvs: -- if build.machine_is_64bit: -- sources.append( -- '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH) -- elif build.machine == 'x86': -- sources.append( -- '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH) -- else: -- raise Exception("Unhandled CPU configuration for SoundTouch") -- elif build.toolchain_is_gnu: -- if build.machine == 'x86_64': -- sources.append( -- '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH) -- else: -- sources.append( -- '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH) -- else: -- raise Exception("Unhandled CPU configuration for SoundTouch") -- -- # TODO(XXX) when we figure out a better way to represent features, fix -- # this. -- optimize = int(util.get_flags(build.env, 'optimize', 1)) -- if build.machine_is_64bit or \ -- (build.toolchain_is_msvs and optimize > 1) or \ -- (build.toolchain_is_gnu and optimize > 2): -- sources.extend( -- ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH, -- ]) -- if build.toolchain_is_msvs and not build.machine_is_64bit: -- sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH) -- else: -- # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have -- # it. -- pass -- -- return sources -+ return ['engine/enginebufferscalest.cpp'] - - def configure(self, build, conf): -- if build.platform_is_windows: -- build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth) -- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH]) -- -- # TODO(XXX) when we figure out a better way to represent features, fix -- # this. -- optimize = int(util.get_flags(build.env, 'optimize', 1)) -- if build.machine_is_64bit or \ -- (build.toolchain_is_msvs and optimize > 1) or \ -- (build.toolchain_is_gnu and optimize > 2): -- build.env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS') -+ if not conf.CheckLib(['SoundTouch','libSoundTouch']): -+ raise Exception('Did not find SoundTouch library, exiting!') -+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch']) -+ build.env.Append(LIBS='SoundTouch') - - class TagLib(Dependence): - def configure(self, build, conf): ---- mixxx-1.10.0/build/features.py -+++ mixxx-1.10.0/build/features.py -@@ -665,25 +659,15 @@ - test_env.Append(CCFLAGS = '-pthread') - test_env.Append(LINKFLAGS = '-pthread') - -- test_env.Append(CPPPATH="#lib/gtest-1.5.0/include") -- gtest_dir = test_env.Dir("#lib/gtest-1.5.0") -- #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0')) -- #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example, optional -- test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib' -- -- env = test_env -- SCons.Export('env') -- env.SConscript(env.File('SConscript', gtest_dir)) -- -- # build and configure gmock -- test_env.Append(CPPPATH="#lib/gmock-1.5.0/include") -- gmock_dir = test_env.Dir("#lib/gmock-1.5.0") -- #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0')) -- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib' -- -- env.SConscript(env.File('SConscript', gmock_dir)) -- -- return [] -+ if not conf.CheckLib('gtest'): -+ raise Exception('Did not find gtest library, exiting!') -+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest']) -+ test_env.Append(LIBS='gtest') -+ -+ if not conf.CheckLib('gmock'): -+ raise Exception('Did not find gmock library, exiting!') -+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock']) -+ test_env.Append(LIBS='gmock') - - class Shoutcast(Feature): - def description(self): ---- mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp -+++ mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp -@@ -20,7 +20,6 @@ - #include "engine/enginefilterbutterworth8.h" - #include "engine/enginefilter.h" - #include "engine/engineobject.h" --#include "../lib/fidlib-0.9.9/fidlib.h" - - /* Local Prototypes */ - inline double _processLowpass(double *coef, double *buf, register double val); ---- mixxx-1.10.0/src/engine/enginefilter.h -+++ mixxx-1.10.0/src/engine/enginefilter.h -@@ -20,7 +20,7 @@ - - #define MIXXX - #include "engine/engineobject.h" --#include "../lib/fidlib-0.9.9/fidlib.h" -+#include "fidlib.h" - #include "defs.h" - - enum filterType{ diff --git a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch deleted file mode 100644 index b89d7f92f76e..000000000000 --- a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- mixxx-1.11.0/src/SConscript -+++ mixxx-1.11.0/src/SConscript -@@ -12,8 +12,8 @@ - from build import util, depends - - mixxx_version = util.get_mixxx_version() --branch_name = util.get_bzr_branch_name() --bazaar_revision = util.get_bzr_revision() -+#branch_name = util.get_bzr_branch_name() -+#bazaar_revision = util.get_bzr_revision() - print "WE ARE IN:", os.getcwd() - - plugins = [] ---- mixxx-1.11.0/src/SConscript.env -+++ mixxx-1.11.0/src/SConscript.env -@@ -20,19 +20,6 @@ - print "Deleting deprecated build file: %s" % defs - os.remove(defs) - --#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun --## instead, embed BZR version into build --## Put version info into a file, so it doesn't force a rebuild of everything :) -- --if os.path.exists(os.path.join('..', 'build.h')): -- # If a build.h exists in the project root mixxx/ directory then use that -- # instead of writing our own. This is mostly since when we build Debian -- # packages we don't have any of the Bazaar metadata so we can't write one -- # ourselves. -- shutil.copy(os.path.join('..', 'build.h'), 'build.h') --else: -- util.write_build_header('build.h') -- - - #Check for dependencies if we're not doing a clean... - #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']): diff --git a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch deleted file mode 100644 index 2f6b62c3440a..000000000000 --- a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch +++ /dev/null @@ -1,223 +0,0 @@ ---- mixxx-1.11.0/build/depends.py -+++ mixxx-1.11.0/build/depends.py -@@ -179,8 +179,8 @@ - # times. - - qt_modules = [ -- 'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg', -- 'QtSql', 'QtScript', 'QtXmlPatterns', 'QtNetwork' -+ 'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', -+ 'QtSql', 'QtScript', 'QtNetwork' - #'QtUiTools', #'QtDesigner', - ] - -@@ -298,25 +298,10 @@ - - class FidLib(Dependence): - -- def sources(self, build): -- symbol = None -- if build.platform_is_windows: -- if build.toolchain_is_msvs: -- symbol = 'T_MSVC' -- elif build.crosscompile: -- # Not sure why, but fidlib won't build with mingw32msvc and -- # T_MINGW -- symbol = 'T_LINUX' -- elif build.toolchain_is_gnu: -- symbol = 'T_MINGW' -- else: -- symbol = 'T_LINUX' -- -- return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c', -- CPPDEFINES=symbol)] -- - def configure(self, build, conf): -- build.env.Append(CPPPATH='#lib/fidlib-0.9.10/') -+ if not conf.CheckLib('fidlib'): -+ raise Exception('Did not find fidlib library, exiting!') -+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib']) - - class ReplayGain(Dependence): - -@@ -327,7 +312,6 @@ - build.env.Append(CPPPATH="#lib/replaygain") - - class SoundTouch(Dependence): -- SOUNDTOUCH_PATH = 'soundtouch-1.6.0' - - def sse_enabled(self, build): - optimize = int(util.get_flags(build.env, 'optimize', 1)) -@@ -336,30 +320,7 @@ - (build.toolchain_is_gnu and optimize > 1)) - - def sources(self, build): -- sources = ['engine/enginebufferscalest.cpp', -- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH] -- -- # SoundTouch CPU optimizations are only for x86 -- # architectures. SoundTouch automatically ignores these files when it is -- # not being built for an architecture that supports them. -- cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \ -- '#lib/%s/cpu_detect_x86_gcc.cpp' -- sources.append(cpu_detection % self.SOUNDTOUCH_PATH) -- -- # Check if the compiler has SSE extention enabled -- # Allways the case on x64 (core instructions) -- if self.sse_enabled(build): -- sources.extend( -- ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH, -- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]) -- return sources -+ return ['engine/enginebufferscalest.cpp'] - - def configure(self, build, conf, env=None): - if env is None: -@@ -367,13 +328,10 @@ - if build.platform_is_windows: - # Regardless of the bitwidth, ST checks for WIN32 - env.Append(CPPDEFINES = 'WIN32') -- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH]) -- -- # Check if the compiler has SSE extention enabled -- # Allways the case on x64 (core instructions) -- optimize = int(util.get_flags(env, 'optimize', 1)) -- if self.sse_enabled(build): -- env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS') -+ if not conf.CheckLib(['SoundTouch','libSoundTouch']): -+ raise Exception('Did not find SoundTouch library, exiting!') -+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch']) -+ build.env.Append(LIBS='SoundTouch') - - class TagLib(Dependence): - def configure(self, build, conf): ---- mixxx-1.11.0/build/features.py -+++ mixxx-1.11.0/build/features.py -@@ -48,7 +48,6 @@ - 'controllers/midi/hss1394enumerator.cpp'] - - class HID(Feature): -- HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre' - def description(self): - return "HID controller support" - -@@ -64,9 +63,6 @@ - def configure(self, build, conf): - if not self.enabled(build): - return -- # TODO(XXX) allow external hidapi install, but for now we just use our -- # internal one. -- build.env.Append(CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')]) - - if build.platform_is_linux: - build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs') -@@ -86,19 +82,17 @@ - - build.env.Append(CPPDEFINES = '__HID__') - -+ if not conf.CheckLib('hidapi-libusb'): -+ raise Exception('Did not find HID API library, exiting!') -+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi']) -+ build.env.Append(LIBS='hidapi-libusb') -+ -+ - def sources(self, build): - sources = ['controllers/hid/hidcontroller.cpp', - 'controllers/hid/hidenumerator.cpp', - 'controllers/hid/hidcontrollerpresetfilehandler.cpp'] - -- if build.platform_is_windows: -- # 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: -- 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')) - return sources - - class Bulk(Feature): -@@ -455,19 +449,6 @@ - - build.env.Append(CPPDEFINES = '__VAMP__') - -- # Needed on Linux at least. Maybe needed elsewhere? -- if build.platform_is_linux: -- # Optionally link libdl and libX11. Required for some distros. -- conf.CheckLib(['dl', 'libdl']) -- conf.CheckLib(['X11', 'libX11']) -- -- # FFTW3 support -- have_fftw3_h = conf.CheckHeader('fftw3.h') -- have_fftw3 = conf.CheckLib('fftw3', autoadd=False) -- if(have_fftw3_h and have_fftw3 and build.platform_is_linux): -- build.env.Append(CPPDEFINES = 'HAVE_FFTW3') -- build.env.ParseConfig('pkg-config fftw3 --silence-errors --cflags --libs') -- - def sources(self, build): - sources = ['vamp/vampanalyser.cpp', - 'vamp/vamppluginloader.cpp', -@@ -725,25 +706,15 @@ - test_env.Append(CCFLAGS = '-pthread') - test_env.Append(LINKFLAGS = '-pthread') - -- test_env.Append(CPPPATH="#lib/gtest-1.5.0/include") -- gtest_dir = test_env.Dir("#lib/gtest-1.5.0") -- #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0')) -- #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example, optional -- test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib' -- -- env = test_env -- SCons.Export('env') -- env.SConscript(env.File('SConscript', gtest_dir)) -- -- # build and configure gmock -- test_env.Append(CPPPATH="#lib/gmock-1.5.0/include") -- gmock_dir = test_env.Dir("#lib/gmock-1.5.0") -- #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0')) -- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib' -- -- env.SConscript(env.File('SConscript', gmock_dir)) -- -- return [] -+ if not conf.CheckLib('gtest'): -+ raise Exception('Did not find gtest library, exiting!') -+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest']) -+ test_env.Append(LIBS='gtest') -+ -+ if not conf.CheckLib('gmock'): -+ raise Exception('Did not find gmock library, exiting!') -+ test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock']) -+ test_env.Append(LIBS='gmock') - - class Shoutcast(Feature): - def description(self): ---- mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp -+++ mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp -@@ -20,7 +20,7 @@ - #include "engine/enginefilterbutterworth8.h" - #include "engine/enginefilter.h" - #include "engine/engineobject.h" --#include "../lib/fidlib-0.9.10/fidlib.h" -+#include - - /* Local Prototypes */ - inline double _processLowpass(double *coef, double *buf, register double val); ---- mixxx-1.11.0/src/engine/enginefilter.h -+++ mixxx-1.11.0/src/engine/enginefilter.h -@@ -20,7 +20,7 @@ - - #define MIXXX - #include "engine/engineobject.h" --#include "../lib/fidlib-0.9.10/fidlib.h" -+#include - #include "defs.h" - - enum filterType{ -- cgit v1.2.3