| [proaudio] [2868] mixxx-9999: updated system-libs patch. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2868
Author: dominique
Date: 2014-04-02 08:53:56 +0200 (Wed, 02 Apr 2014)
Log Message:
-----------
mixxx-9999: updated system-libs patch. Thanks to Alex Barker
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
trunk/overlays/proaudio/media-sound/mixxx/Manifest
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2014-04-01 17:45:30 UTC (rev 2867)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2014-04-02 06:53:56 UTC (rev 2868)
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Mar 2014; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ mixxx-9999-system-libs.patch: updated for new offsets.
+ Thanks to Alex Barker for the updated patch.
+
08 Mar 2014; Matt Henley (nwmatt) <nwmatt@xxxxxxxxx>
mixxx-9999-docs.patch: updated for new offset.
Thanks to Alex Barker for updated patch.
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2014-04-01 17:45:30 UTC (rev 2867)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2014-04-02 06:53:56 UTC (rev 2868)
@@ -8,10 +8,10 @@
AUX mixxx-1.11.9999-system-libs.patch 8072 SHA256 996c6a170e06a5b4b0250f6fcefd80be8cb6d51325ee19c231360f1892567cb1 SHA512 d8d6ab9162b365288e224bfe2611c3322d539e35284c26ede0c829a29508a1047ad8e28c08bc769a0c72bfc70e69ebca71ac8e0217fb78c5904582153c1ae267 WHIRLPOOL 0fffac4355f882e01fefaaca19cdbf9cc048d1ef6892f2451c7e7163ad19fa17e41685980acb8cd62d4530010f3ec88db8962827d35fb9f9ec5ff564adaafa89
AUX mixxx-9999-cflags.patch 565 SHA256 a0e19566dad57446c7991efb3bbb6201b57a7608cbf23dccfc90fd7f36f38a02 SHA512 31ab088e9c7f55f1cd0ee277aa43ee1ca0ac514dd78a280121e84e0c875a9ecf4200a94e55b6fe73e7b56f1a40123b7232937ebf7d22458fb5b29fd90cd0038e WHIRLPOOL c6ff82134c0e9f7714cb7e1e60d9314018da4c4f48db80e9e60e08390b1a5af5eaa53bbb64e774446876093fdeb17445b7328ee8735da55398cf3ac089edb0a5
AUX mixxx-9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
-AUX mixxx-9999-system-libs.patch 7725 SHA256 710e0aa4090e75e371c30f100b9a47ae744e2710790d2cdbfb698de95c8e180c SHA512 64cce074424b645920733928d6643164548fce6a09ca4aa96bfd2e5e562057ef594136f7e2f60afdeca436f14284dff9e1e3c7b81a256367488ba9ae8335d94c WHIRLPOOL 9d8a279dc0120aef13f771ac67324b58686a826bdae53ec3ca010d81b353babfd569f64fc56cb795f3753a60bfa93a6f6d68a3a64b7e23171560d649620b11e7
+AUX mixxx-9999-system-libs.patch 7712 SHA256 c80714c187041d700b35cc254a002eabdb5859b095ea309ccb7a0deb9fdeddcd SHA512 269deff691a434e5426a51323df4ff5a54f48008f6d85f545e78170e5b30ba6e77cd0ed24feb64fdf0c8581314d895d1e9a955543e2d16619a579d691a4743e1 WHIRLPOOL 1ef1fd773ed4f80a8e49fb3a5b5fce34f672c7469efdb0eef1d6bc608fbc9110410b918d0dcb8ea9ff529168d7c3a2b18648fd5710179a3e962e11de08155c8c
DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1
EBUILD mixxx-1.11.0.ebuild 2268 SHA256 3073dae0132a766076bef6ea221a524ebc0e3a31f2c1d60cab1fad902bb4b4b3 SHA512 441141d4c366cff455998cbd42daed61e745b91940b39dccc5f4a3cce268dcd16d1ae7b1e55033bf53f68a7c65aa486f9f91b571c5888d02d8d1b7f43934168d WHIRLPOOL 895a2e2288c6e46298c4bd31dff4ca1fb900b1c324906b27c0e1efbedc5499c0a727afc8bd8cd168f3af944c9e3e00e382271dfa9ee88111889a203d9c078658
EBUILD mixxx-1.11.9999.ebuild 2263 SHA256 3d0226957b626e92f6ba2f9d6a7b2d764f6282f940ef77bd534b11fb609b1fc8 SHA512 b94e1a928cbb6f12abb19e0080bb098c58f4458010b866feb6358f745d72208524369e55d3ed8e06c24ef315426a85e9d14263faf52e54e14fdbb9846bb30ccf WHIRLPOOL 2117ce352078cd1e2ca9e8c7abd7d91e61d13b9a18ab3ec880b462c332e8a413b130bc1af150136a0beab41ccbb81bdc229c4bb29f14c673c8a3a24ffd3136c3
EBUILD mixxx-9999.ebuild 2315 SHA256 bb5715e98a5d5f135d834414e655953485acb7d527ce300f151900e2a7c8e311 SHA512 13b4dd4371fabe3e7024d7e8c07d35b3058cb4ff280185d8b5397cd68de370e82b9434ac29d9d3ca8ff4da629ddfce10c5f7eedd806ab10679159fdc1d7a1fe1 WHIRLPOOL 5cd8dfa5079aa381e44fbd5e09dd9e7d4255e774bb59fe7d8ec682c7c0642091b3db45bca7b1242cfee59f63463353438720100434062b60a69c6d01b5cb0ac7
-MISC ChangeLog 7434 SHA256 5ed4808e6b62df2b6d1e93cf28f9e8bbbab9a2077a7a35a0545f1b07e8dbb5bd SHA512 bf66978e1981993d1045b0ce721b7206dcd9a5577e91bb90f6d53f92c73dce3a21238f3d8889d1db8fd98882802960f708651f2452e237af6500a6501fb003a4 WHIRLPOOL 208cedc769a93ea797640b88c62489cc8912fecfde4ade65c6a91989899e57326c24d4deff7e371d31a417a0666fcadce0fd921ce5724302230cae5e5a4f157a
+MISC ChangeLog 7611 SHA256 4a53aa596425fde7bc5a16fd37690261c3d0ec0b214954e28c561e5390479078 SHA512 0b3c0603e6df7c8f41f761866306a5a3bf4db7bbaf50013a2e0124d2c8fd0794f75b173c5b7793132c3856efd6b3225610e2265247168c493649d8d9cf72ef39 WHIRLPOOL f0ddb5fb421682a0eb58204d888eb4978766f5b9ae63645bcfcbb8c20de2f587d02700568ecc11a30171dedc30f50b72ff6ba8a932eb25ec719a04c4e3d37143
MISC metadata.xml 485 SHA256 2d28e5b3222a404cd0ae26b12d70640ed15c665204a43496862b77f0396f2038 SHA512 cf3578bae5e75f6b5db4ca71cd00a9389878d87d0983b0c5e0b2858336bd30186df13c58b03b9f1f2e698b651d360058ed0ff63771be6ba98128ae30b886d7f7 WHIRLPOOL 275c04e470f80968e15e0c3ef77cfa4f6fe89917b01ce1d94ea7bebdfd30ee54baae32678d79e7d28dde24bd0f4ad1f8756f185638e77421ab22ebca8e42c555
Modified: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch 2014-04-01 17:45:30 UTC (rev 2867)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch 2014-04-02 06:53:56 UTC (rev 2868)
@@ -1,6 +1,6 @@
--- mixxx-9999/build/depends.py
+++ mixxx-9999/build/depends.py
-@@ -317,26 +317,10 @@ class Qt(Dependence):
+@@ -377,25 +377,10 @@ class TestHeaders(Dependence):
class FidLib(Dependence):
@@ -23,22 +23,21 @@
-
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):
+@@ -408,7 +393,6 @@ class ReplayGain(Dependence):
-@@ -348,7 +332,6 @@ class ReplayGain(Dependence):
-
class SoundTouch(Dependence):
- SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
def sse_enabled(self, build):
optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -357,30 +340,7 @@ class SoundTouch(Dependence):
+@@ -417,30 +401,7 @@ class SoundTouch(Dependence):
(build.toolchain_is_gnu and optimize > 1))
def sources(self, build):
@@ -70,7 +69,7 @@
def configure(self, build, conf, env=None):
if env is None:
-@@ -388,12 +348,11 @@ class SoundTouch(Dependence):
+@@ -448,12 +409,11 @@ class SoundTouch(Dependence):
if build.platform_is_windows:
# Regardless of the bitwidth, ST checks for WIN32
env.Append(CPPDEFINES='WIN32')
@@ -110,7 +109,7 @@
if build.platform_is_linux:
build.env.ParseConfig(
-@@ -96,22 +91,16 @@ class HID(Feature):
+@@ -95,22 +90,16 @@ class HID(Feature):
build.env.Append(CPPDEFINES='__HID__')
@@ -138,41 +137,39 @@
return sources
-@@ -817,26 +806,15 @@ class TestSuite(Feature):
+@@ -798,24 +787,15 @@ class TestSuite(Feature):
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")
+- 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.5.0/lib'
+- 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.5.0/include")
-- gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
+- 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.5.0/lib'
+- 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')
-
-- return []
++
+ 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):
+ return []
--- mixxx-9999/src/engine/enginefilter.h
@@ -197,5 +194,5 @@
-#include "../lib/fidlib-0.9.10/fidlib.h"
+#include <fidlib.h>
- inline double _processLowpass(double *coef, double *buf, register double val);
- inline double _processBandpass(double *coef, double *buf, register double val);
+ inline CSAMPLE _processLowpass(CSAMPLE *coef, CSAMPLE *buf, register CSAMPLE val);
+ inline CSAMPLE _processBandpass(CSAMPLE *coef, CSAMPLE *buf, register CSAMPLE val);