From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- media-sound/mixxx/Manifest | 2 + 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 +++++++++++++++++++++ media-sound/mixxx/metadata.xml | 10 + media-sound/mixxx/mixxx-1.10.1.ebuild | 85 ++++++++ media-sound/mixxx/mixxx-1.11.0.ebuild | 98 +++++++++ 10 files changed, 685 insertions(+) create mode 100644 media-sound/mixxx/Manifest create mode 100644 media-sound/mixxx/files/mixxx-1.10.0-cflags.patch create mode 100644 media-sound/mixxx/files/mixxx-1.10.0-docs.patch create mode 100644 media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch create mode 100644 media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch create mode 100644 media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch create mode 100644 media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch create mode 100644 media-sound/mixxx/metadata.xml create mode 100644 media-sound/mixxx/mixxx-1.10.1.ebuild create mode 100644 media-sound/mixxx/mixxx-1.11.0.ebuild (limited to 'media-sound/mixxx') diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest new file mode 100644 index 000000000000..abcdcd865fe1 --- /dev/null +++ b/media-sound/mixxx/Manifest @@ -0,0 +1,2 @@ +DIST mixxx-1.10.1-src.tar.gz 15948956 SHA256 eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365 SHA512 eff18cba96d781830d33a35cf74dcac0dc33c9d2c16e9533d171d2acc2fd0ad602f5bb46d62212e224e61357332a5d9ed078ca86532f39ee01057eb3aaf09af3 WHIRLPOOL 39fda17c512030da1c4de4e495ad22ff9fda9b5aeccfcdd3a7f35d08ebed79c2e6655bef409a43bfd25a072a01e3512669a566048f40b46c9d1c3143f58f821c +DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1 diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch new file mode 100644 index 000000000000..b6c8655a73a6 --- /dev/null +++ b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..c9205179881c --- /dev/null +++ b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..40f32266bb5e --- /dev/null +++ b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch @@ -0,0 +1,37 @@ +--- 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 new file mode 100644 index 000000000000..d2e21f3e005b --- /dev/null +++ b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch @@ -0,0 +1,172 @@ +--- 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 new file mode 100644 index 000000000000..b89d7f92f76e --- /dev/null +++ b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch @@ -0,0 +1,35 @@ +--- 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 new file mode 100644 index 000000000000..2f6b62c3440a --- /dev/null +++ b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch @@ -0,0 +1,223 @@ +--- 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{ diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml new file mode 100644 index 000000000000..90052b15c004 --- /dev/null +++ b/media-sound/mixxx/metadata.xml @@ -0,0 +1,10 @@ + + + + proaudio + + Enable HID controller support + Enable broadcasting support via media-libs/libshout + Enable vamp analyzing plugins support + + diff --git a/media-sound/mixxx/mixxx-1.10.1.ebuild b/media-sound/mixxx/mixxx-1.10.1.ebuild new file mode 100644 index 000000000000..a5e2a4081476 --- /dev/null +++ b/media-sound/mixxx/mixxx-1.10.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit eutils multilib scons-utils toolchain-funcs + +DESCRIPTION="A Qt based Digital DJ tool" +HOMEPAGE="http://mixxx.sourceforge.net" +SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="aac debug doc mp3 pulseaudio shout wavpack" + +RDEPEND="media-libs/fidlib + media-libs/flac + media-libs/libid3tag + media-libs/libogg + media-libs/libsndfile + >=media-libs/libsoundtouch-1.5 + media-libs/libvorbis + >=media-libs/portaudio-19_pre + media-libs/portmidi + media-libs/taglib + virtual/glu + virtual/opengl + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + dev-qt/qtsql:4 + dev-qt/qtsvg:4 + dev-qt/qtwebkit:4 + dev-qt/qtxmlpatterns:4 + aac? ( + media-libs/faad2 + media-libs/libmp4v2:0 + ) + mp3? ( media-libs/libmad ) + pulseaudio? ( media-sound/pulseaudio ) + shout? ( media-libs/libshout ) + wavpack? ( media-sound/wavpack )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.10.0-system-libs.patch + epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch + epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch + epatch "${FILESDIR}"/${PN}-1.10.0-no-bzr.patch + + # use multilib compatible directory for plugins + sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die + + # alter startup command when pulseaudio support is disabled + if ! use pulseaudio ; then + sed -i -e 's:pasuspender ::' src/mixxx.desktop || die + fi +} + +src_compile() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ + LIBPATH="/usr/$(get_libdir)" escons \ + prefix=/usr \ + qtdir=/usr/$(get_libdir)/qt4 \ + hifieq=1 \ + vinylcontrol=1 \ + optimize=0 \ + $(use_scons aac faad) \ + $(use_scons debug qdebug) \ + $(use_scons mp3 mad) \ + $(use_scons shout shoutcast) \ + $(use_scons wavpack wv) +} + +src_install() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ + LIBPATH="/usr/$(get_libdir)" escons install \ + prefix=/usr \ + qtdir=/usr/$(get_libdir)/qt4 \ + install_root="${D}"/usr + + dodoc README Mixxx-Manual.pdf +} diff --git a/media-sound/mixxx/mixxx-1.11.0.ebuild b/media-sound/mixxx/mixxx-1.11.0.ebuild new file mode 100644 index 000000000000..7e06555bea87 --- /dev/null +++ b/media-sound/mixxx/mixxx-1.11.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib scons-utils toolchain-funcs + +DESCRIPTION="A Qt based Digital DJ tool" +HOMEPAGE="http://mixxx.sourceforge.net" +SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aac debug doc hid mp3 mp4 pulseaudio shout vamp wavpack" + +RDEPEND=" + dev-libs/protobuf:= + dev-libs/libusb:1 + >=media-libs/fidlib-0.9.10-r1 + media-libs/flac + media-libs/libid3tag + media-libs/libogg + media-libs/libsndfile + >=media-libs/libsoundtouch-1.5 + media-libs/libvorbis + >=media-libs/portaudio-19_pre + media-libs/portmidi + media-libs/taglib + virtual/glu + virtual/opengl + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + dev-qt/qtscript:4 + dev-qt/qtsql:4 + aac? ( + media-libs/faad2 + media-libs/libmp4v2:0 + ) + hid? ( dev-libs/hidapi ) + mp3? ( media-libs/libmad ) + mp4? ( media-libs/libmp4v2 ) + pulseaudio? ( media-sound/pulseaudio ) + shout? ( media-libs/libshout ) + wavpack? ( media-sound/wavpack ) + vamp? ( media-libs/vamp-plugin-sdk ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch + epatch "${FILESDIR}"/${P}-system-libs.patch + EPATCH_OPTS="-l" epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch + epatch "${FILESDIR}"/${P}-no-bzr.patch + + # use multilib compatible directory for plugins + sed -i "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die + + # alter startup command when pulseaudio support is disabled + if ! use pulseaudio ; then + sed -i 's:pasuspender ::' src/mixxx.desktop || die + fi +} + +src_configure() { + myesconsargs=( + prefix="${EPREFIX}/usr" + qtdir="${EPREFIX}/usr/$(get_libdir)/qt4" + hifieq=1 + vinylcontrol=1 + optimize=0 + $(use_scons aac faad) + $(use_scons debug qdebug) + $(use_scons hid hid) + $(use_scons mp3 mad) + $(use_scons mp4 m4a) + $(use_scons shout shoutcast) + $(use_scons wavpack wv) + $(use_scons vamp) + ) +} + +src_compile() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ + LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons +} + +src_install() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \ + LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons \ + install_root="${ED}"/usr install + + dodoc README Mixxx-Manual.pdf +} -- cgit v1.2.3-65-gdbad