dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 09:32:37 +01:00
Code Issues Releases Wiki Activity

- media-sound/mixxx: update patch

Browse Source
This commit is contained in:
David GUGLIELMI
2015-11-22 22:00:58 +01:00
parent 6ad191c244
commit b55a57caf6
4 changed files with 160 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media-sound/mixxx/Manifest
View File

@@ -1,6 +1,7 @@
AUX mixxx-1.12.0_beta1-system-libs.patch 5847 SHA256 0b5cb0db508eb921f9461e20a490afd729a332d11624d192738b19f5cb34a010 SHA512 5caf650bf917cb36605ef8b04a8fdc4715772f6801ebdf25b1bd36d7293c996e0af4dae473cc0a6a72fdb9b93430c24ba50e78fe97503d20c3b5532c4e9d0c65 WHIRLPOOL 4eab9f4038fdc40cc9a8f92a161ab6990df21c51a4cf3b4b7dc990bae3923280d9798c968738de0d70180b5d0fb1163ff17d6cce715e1e04b6431674e25b8c6e
AUX mixxx-1.12.0_beta1-use-cpp-built-in-types.patch 944 SHA256 69e1e1af26f0893ea7d5a3c2eb0cd8207e50b9a0de30194dc7719d3057cd1540 SHA512 6d0750bb3d1261602af99d401b63183d1c2380cd4958c1236fe1d4f618f541b3e77ed00ea14b341a474fc929c21b9ce20f8cb051de7f23db002d2d1c0c68a357 WHIRLPOOL e0294c52f45309bad2f07120c4480690d3373810689166ee7b328f689ddb93a1e50d44570dc7e81426dec8827cd4b476527772a6ef60936f6656288d47bdc024
AUX mixxx-1.12.9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
AUX mixxx-1.12.9999-system-libs.patch 5847 SHA256 0b5cb0db508eb921f9461e20a490afd729a332d11624d192738b19f5cb34a010 SHA512 5caf650bf917cb36605ef8b04a8fdc4715772f6801ebdf25b1bd36d7293c996e0af4dae473cc0a6a72fdb9b93430c24ba50e78fe97503d20c3b5532c4e9d0c65 WHIRLPOOL 4eab9f4038fdc40cc9a8f92a161ab6990df21c51a4cf3b4b7dc990bae3923280d9798c968738de0d70180b5d0fb1163ff17d6cce715e1e04b6431674e25b8c6e
AUX mixxx-1.12.9999-system-libs.patch 5820 SHA256 cab50fae35ed68bec4e15e8ddf8476fec818be857f9cc82eb403736b8d4fe7a5 SHA512 1d078ce55f3d972e87cc8e5bce755958dc5c16321511472ebd14a3572d13d836e1a41d8b4f76d69f06ede4d64981adb804788528662cc36b6ee80e262cf71086 WHIRLPOOL 6022ce76ba80d9867d3b28b179ef98dbee84169e8296dccf0eec9404f562df5b27f7fe5c191a1de3d99ee719cb5d9891b59a2f77fa62dc1ba269059df7ac2013
DIST mixxx-1.12.0_beta1.tar.gz 24780154 SHA256 1204b04044b090b297c2863118dde4f2962d557f9bf606b1069efe824e18616f SHA512 1fe6ca8c876b2a33c3e0a329ddf53856e037f2e8e6574dae86c46a364cf604f124d0f8e2f5abd150307c4baeeeb7cf9c516d681989d2f7cf54c421ce7ddb76bb WHIRLPOOL e4e970e301509d36d555d07b317828f81734509f739bebeac174007048a800910eecd546c8e1beacb2baec7a96220a35012abdde4703b7c67e497843d915bb53
EBUILD mixxx-1.12.0_beta1.ebuild 2964 SHA256 24231b48448545403b589da5d9034cb10d2aa559a715e9965879015ddb81c9ce SHA512 f900bd7e07ed85632caef5eb06ed2391bdbb295f476dc2316861f2f840b0e6cb4335dea5c3466e40c665a001775f13456b571ca8b2bac774b009dda02b767fab WHIRLPOOL 9ce6e14c19c1adf46fce9a2b6667a93ada7c66d7dc221f31627a4154d3aefdca555a53e222dd998fe0fb37a7e0fe3e3bfbacf7a4c407776723b5e1753edb4ef1
EBUILD mixxx-1.12.0_beta1.ebuild 2967 SHA256 f3f6f0ace4be8d81bc845a0f6b14863b87f6ea646591e9074603c955d8d696cd SHA512 dba6f02ea2f9e314e1a323a3130448daddd0301f1387691b737a5cdc2363d50b5471360a5e2982e9ace2c8f237ecfa793c46405c6998edb1618afe38deb5602a WHIRLPOOL 1d2468c49cccc84b03c705672a33dcf5ff33fe5755908ca99a6a2eaf534c39550cdad50cfcb9cfe93dbb2fe9ebdc2e108baa39dd1b2498d366024ba810d661e0
EBUILD mixxx-1.12.9999.ebuild 2679 SHA256 cbc078e3536fb0a3b1ce02fa478b99aaafb2ffd666c8cbe38ff99333fdd4f7fc SHA512 485cfde679e9501a2f7a1467bf76ed9c1ba408fdc40e6ec8f55517f41ae7d970255a25954b5a992c7eb3b5fab8b1a69d195cead73726190b104618d8cc7d6202 WHIRLPOOL 4ea86a7690d5cb0ec9334f51d05cea0bf317e0f7e1589fc2ea348d2ba8b49682820024328db3031372d075cc5eb15de0b2f4e7b6835cbba876ed78a30a6a2e44

139
media-sound/mixxx/files/mixxx-1.12.0_beta1-system-libs.patch Normal file
View File

@@ -0,0 +1,139 @@
diff --git a/build/depends.py b/build/depends.py
index 77f4c4f..a3d0df0 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -378,42 +363,17 @@ class ReplayGain(Dependence):
class SoundTouch(Dependence):
- SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
def sources(self, build):
- return ['engine/enginebufferscalest.cpp',
- '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateCubic.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateLinear.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/InterpolateShannon.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/TDStretch.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.
- '#lib/%s/cpu_detect_x86.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
- '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH]
+ return ['engine/enginebufferscalest.cpp']
def configure(self, build, conf, env=None):
if env is None:
env = build.env
- env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
-
- # Prevents circular import.
- from features import Optimize
-
- # If we do not want optimizations then disable them.
- optimize = (build.flags['optimize'] if 'optimize' in build.flags
- else Optimize.get_optimization_level())
- if optimize == Optimize.LEVEL_OFF:
- env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_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 RubberBand(Dependence):
diff --git a/build/features.py b/build/features.py
index 2ef1ecd..c100f3b 100644
--- a/build/features.py
+++ b/build/features.py
@@ -45,7 +45,6 @@ class HSS1394(Feature):
class HID(Feature):
- HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
def description(self):
return "HID controller support"
@@ -62,10 +61,6 @@ class HID(Feature):
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(
@@ -89,23 +84,18 @@ class HID(Feature):
build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
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
@@ -717,24 +707,15 @@ class TestSuite(Feature):
test_env.Append(CCFLAGS='-pthread')
test_env.Append(LINKFLAGS='-pthread')
- test_env.Append(CPPPATH="#lib/gtest-1.7.0/include")
- gtest_dir = test_env.Dir("#lib/gtest-1.7.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.7.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.7.0/include")
- gmock_dir = test_env.Dir("#lib/gmock-1.7.0")
- # gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
- test_env['LIB_OUTPUT'] = '#/lib/gmock-1.7.0/lib'
-
- env.SConscript(env.File('SConscript', gmock_dir))
+ 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')
return []

34
media-sound/mixxx/files/mixxx-1.12.9999-system-libs.patch
View File

@@ -1,12 +1,8 @@
diff --git a/build/depends.py b/build/depends.py
index 77f4c4f..a3d0df0 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -378,42 +363,17 @@ class ReplayGain(Dependence):
class SoundTouch(Dependence):
- SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
diff -dNur a/build/depends.py b/build/depends.py
--- a/build/depends.py 2015-11-22 21:50:35.703506778 +0100
+++ b/build/depends.py 2015-11-22 21:54:50.603417604 +0100
@@ -403,40 +403,15 @@
SOUNDTOUCH_PATH = 'soundtouch-1.8.0'
def sources(self, build):
- return ['engine/enginebufferscalest.cpp',
@@ -40,21 +36,21 @@ index 77f4c4f..a3d0df0 100644
-
- # If we do not want optimizations then disable them.
- optimize = (build.flags['optimize'] if 'optimize' in build.flags
- else Optimize.get_optimization_level())
- else Optimize.get_optimization_level(build))
- if optimize == Optimize.LEVEL_OFF:
- env.Append(CPPDEFINES='SOUNDTOUCH_DISABLE_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 RubberBand(Dependence):
diff --git a/build/features.py b/build/features.py
index 2ef1ecd..c100f3b 100644
--- a/build/features.py
+++ b/build/features.py
@@ -45,7 +45,6 @@ class HSS1394(Feature):
def sources(self, build):
diff -dNur a/build/features.py b/build/features.py
--- a/build/features.py 2015-11-22 21:50:35.703506778 +0100
+++ b/build/features.py 2015-11-22 21:51:44.230407521 +0100
@@ -45,7 +45,6 @@
class HID(Feature):
@@ -62,7 +58,7 @@ index 2ef1ecd..c100f3b 100644
def description(self):
return "HID controller support"
@@ -62,10 +61,6 @@ class HID(Feature):
@@ -62,10 +61,6 @@
def configure(self, build, conf):
if not self.enabled(build):
return
@@ -73,7 +69,7 @@ index 2ef1ecd..c100f3b 100644
if build.platform_is_linux:
build.env.ParseConfig(
@@ -89,23 +84,18 @@ class HID(Feature):
@@ -89,23 +84,18 @@
build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
build.env.Append(CPPDEFINES='__HID__')
@@ -103,7 +99,7 @@ index 2ef1ecd..c100f3b 100644
return sources
@@ -717,24 +707,15 @@ class TestSuite(Feature):
@@ -744,24 +734,15 @@
test_env.Append(CCFLAGS='-pthread')
test_env.Append(LINKFLAGS='-pthread')

2
media-sound/mixxx/mixxx-1.12.0_beta1.ebuild
View File

@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}-release-${PV/_/-}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.12.9999-system-libs.patch
epatch "${FILESDIR}"/${PN}-1.12.0_beta1-system-libs.patch
epatch "${FILESDIR}"/${PN}-1.12.9999-docs.patch
epatch "${FILESDIR}"/${PN}-1.12.0_beta1-use-cpp-built-in-types.patch