| [proaudio] [2816] media-sound/mixxx: updated patches and removed 9999-no-bzr patch. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2816
Author: lilrc
Date: 2013-12-08 23:10:23 +0100 (Sun, 08 Dec 2013)
Log Message:
-----------
media-sound/mixxx: updated patches and removed 9999-no-bzr patch. Thanks to Alex Barker for updated ebuild and patches. Added missing dependcy on qttest
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-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2013-12-08 21:09:33 UTC (rev 2815)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2013-12-08 22:10:23 UTC (rev 2816)
@@ -3,6 +3,13 @@
# $Header: $
08 Dec 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ mixxx-9999.ebuild, files/mixxx-9999-cflags.patch,
+ -files/mixxx-9999-no-bzr.patch, files/mixxx-9999-system-libs.patch:
+ Updated patches and removed 9999-no-bzr patch because it functions
+ correctly upstream. Thanks to Alex Barker for updated ebuild and patches.
+ Added missing dependency on dev-qt/qttest.
+
+ 08 Dec 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
mixxx-9999.ebuild:
Added dependency on media-libs/rubberband. Thanks to Alex Barker for updated
ebuild.
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2013-12-08 21:09:33 UTC (rev 2815)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2013-12-08 22:10:23 UTC (rev 2816)
@@ -6,13 +6,12 @@
AUX mixxx-1.11.9999-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
AUX mixxx-1.11.9999-no-bzr.patch 1468 SHA256 6075410573cd0911623dd0a160cdefe6a48c3f335eeef682d80eebf52b75446e SHA512 d5aa2071a836cad7c995f1e83af3ee06687a4444845583013df2023bc11f58a626c1f887fe49385b562d26d70a156383ba47d4dd6ae61b194790b1ac498e8f7c WHIRLPOOL ff247e659c62bbbe3f0989c78a284c9ea6815e162e185b6fa8844775521d268fbfbed59197b27d2949376f7db070b8aa9a4f4bf5ce9d674c8d763df9908cc0fe
AUX mixxx-1.11.9999-system-libs.patch 8072 SHA256 996c6a170e06a5b4b0250f6fcefd80be8cb6d51325ee19c231360f1892567cb1 SHA512 d8d6ab9162b365288e224bfe2611c3322d539e35284c26ede0c829a29508a1047ad8e28c08bc769a0c72bfc70e69ebca71ac8e0217fb78c5904582153c1ae267 WHIRLPOOL 0fffac4355f882e01fefaaca19cdbf9cc048d1ef6892f2451c7e7163ad19fa17e41685980acb8cd62d4530010f3ec88db8962827d35fb9f9ec5ff564adaafa89
-AUX mixxx-9999-cflags.patch 641 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549 SHA512 8fcd2ba6dba5fb3b0e0a0058b965fe25b6c34b1d787d1d920666f9426ffffc84253913ef5b606e14fd4b0f5dfb26bfeb04d4424c856fe7d57e62b837144dab37 WHIRLPOOL 8528a3ee74925a4e338fed9b9d803944cd001ef3f385892fc1d1abfdaab462f1118a3365599572005f9795a9763fdcb4345e9d9f008cacfcbba7d0f6751fbfa7
+AUX mixxx-9999-cflags.patch 565 SHA256 a0e19566dad57446c7991efb3bbb6201b57a7608cbf23dccfc90fd7f36f38a02 SHA512 31ab088e9c7f55f1cd0ee277aa43ee1ca0ac514dd78a280121e84e0c875a9ecf4200a94e55b6fe73e7b56f1a40123b7232937ebf7d22458fb5b29fd90cd0038e WHIRLPOOL c6ff82134c0e9f7714cb7e1e60d9314018da4c4f48db80e9e60e08390b1a5af5eaa53bbb64e774446876093fdeb17445b7328ee8735da55398cf3ac089edb0a5
AUX mixxx-9999-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
-AUX mixxx-9999-no-bzr.patch 1598 SHA256 2811df95e2d305efccdeb5c86bde702bfe9d26e0594943bd124c20b4d61c63c0 SHA512 622e1520ca6cf40e99d89b9359a91e1b14435e09c5271dbb42ef65ed3695257ac98234c13129c5f2df1b792317ca80175ef0a3f51ff6470b2097812e6bd9d14b WHIRLPOOL f4a08c38655b3a4f2d12d3fc1ec57609ccd73d15386eea85b214f24580d6d0f9cd97f3e472a13a2d4dcca2da5de10e9e3a05df8c9d22455e6bbb23c49e295a97
-AUX mixxx-9999-system-libs.patch 8072 SHA256 996c6a170e06a5b4b0250f6fcefd80be8cb6d51325ee19c231360f1892567cb1 SHA512 d8d6ab9162b365288e224bfe2611c3322d539e35284c26ede0c829a29508a1047ad8e28c08bc769a0c72bfc70e69ebca71ac8e0217fb78c5904582153c1ae267 WHIRLPOOL 0fffac4355f882e01fefaaca19cdbf9cc048d1ef6892f2451c7e7163ad19fa17e41685980acb8cd62d4530010f3ec88db8962827d35fb9f9ec5ff564adaafa89
+AUX mixxx-9999-system-libs.patch 7725 SHA256 710e0aa4090e75e371c30f100b9a47ae744e2710790d2cdbfb698de95c8e180c SHA512 64cce074424b645920733928d6643164548fce6a09ca4aa96bfd2e5e562057ef594136f7e2f60afdeca436f14284dff9e1e3c7b81a256367488ba9ae8335d94c WHIRLPOOL 9d8a279dc0120aef13f771ac67324b58686a826bdae53ec3ca010d81b353babfd569f64fc56cb795f3753a60bfa93a6f6d68a3a64b7e23171560d649620b11e7
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 2338 SHA256 f880b434f6a809c20ffe6156b6818d63faa93418fe3e0cd8c0e3db8651dbfbca SHA512 5bc3311a2943227ce699c51ee82a027c7634f1f848e1b5f63198a8c9590576b94e449c4562072bc873f3d1597b66b5bf5fe2ce9e91d176d1b3d075ae53107f70 WHIRLPOOL 8594461cad837d208bf62f55db45879d7e77d908ec2697a5bacf0a030f68a737eb57796185df9184c7aa3acd32e64bff1b25e32b1489d8d1a786482f6fa8119f
-MISC ChangeLog 6907 SHA256 810c13629cff005032d4328f5504d94868446c6a5656db277949a6a252feba96 SHA512 8c2800a2a5f51414a94958ae79a6e65d7dd1ba8347e387fdc3d93c619b0cc9fd1524c8a5c45c231fa35834d0c287005d7dffd67546c990e71dc2b668b36a1914 WHIRLPOOL 6248ee474d4c6d2d93d7440fc9ab5f6773f2e0484c47d6bc6d4106ff928633339de2a8b5ebc5400ce11ec24b8718d10409e65603ee1cc176fadcc30f434cdae5
+EBUILD mixxx-9999.ebuild 2315 SHA256 bb5715e98a5d5f135d834414e655953485acb7d527ce300f151900e2a7c8e311 SHA512 13b4dd4371fabe3e7024d7e8c07d35b3058cb4ff280185d8b5397cd68de370e82b9434ac29d9d3ca8ff4da629ddfce10c5f7eedd806ab10679159fdc1d7a1fe1 WHIRLPOOL 5cd8dfa5079aa381e44fbd5e09dd9e7d4255e774bb59fe7d8ec682c7c0642091b3db45bca7b1242cfee59f63463353438720100434062b60a69c6d01b5cb0ac7
+MISC ChangeLog 7286 SHA256 7a4ae10cf8c3c0ae4c2adcf517ec6d220fcb1f586e3a42fffd9dc023f59f0df4 SHA512 ee1184949f5d33055d334a447c26924f9e4ddf357a25e6ed94879f8c13572829f1cefe3c8ddb48d58842883cc9f4251f9288ceb82c225d9e128159e0f5ca3793 WHIRLPOOL 4d51d417da99fd6deabb305ca07ef9f58a52e6d81958022b844e0687d92816709ac768beab75140d4fd2f5e0582ec7d85e0bea143f584c27f81320d81feea385
MISC metadata.xml 485 SHA256 2d28e5b3222a404cd0ae26b12d70640ed15c665204a43496862b77f0396f2038 SHA512 cf3578bae5e75f6b5db4ca71cd00a9389878d87d0983b0c5e0b2858336bd30186df13c58b03b9f1f2e698b651d360058ed0ff63771be6ba98128ae30b886d7f7 WHIRLPOOL 275c04e470f80968e15e0c3ef77cfa4f6fe89917b01ce1d94ea7bebdfd30ee54baae32678d79e7d28dde24bd0f4ad1f8756f185638e77421ab22ebca8e42c555
Modified: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch 2013-12-08 21:09:33 UTC (rev 2815)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-cflags.patch 2013-12-08 22:10:23 UTC (rev 2816)
@@ -1,13 +1,13 @@
---- mixxx-9999/build/depends.py 2010-12-22 11:13:22.000000000 -0800
-+++ mixxx-9999/build/depends.py 2010-12-22 11:14:02.000000000 -0800
-@@ -587,10 +587,8 @@
+--- mixxx-9999/build/depends.py
++++ mixxx-9999/build/depends.py
+@@ -862,10 +862,8 @@ 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')
+- 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
+ # returns a non zeros return code if g++ is found
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch 2013-12-08 21:09:33 UTC (rev 2815)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch 2013-12-08 22:10:23 UTC (rev 2816)
@@ -1,41 +0,0 @@
-=== modified file 'mixxx/src/SConscript'
---- mixxx/src/SConscript 2013-05-20 20:40:21 +0000
-+++ mixxx/src/SConscript 2013-05-22 02:58:18 +0000
-@@ -12,9 +12,9 @@
- from build import util, depends
-
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_branch_name()
--vcs_revision = util.get_revision()
--vcs_name = util.get_current_vcs()
-+branch_name = "gentoo"
-+vcs_revision = 9999
-+vcs_name = "none"
- print "WE ARE IN:", os.getcwd()
- print "Building ", branch_name, " - rev.", vcs_revision
-
-
-=== modified file 'mixxx/src/SConscript.env'
---- mixxx/src/SConscript.env 2012-09-06 08:04:47 +0000
-+++ mixxx/src/SConscript.env 2013-05-22 03:00:12 +0000
-@@ -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']):
-
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 2013-12-08 21:09:33 UTC (rev 2815)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch 2013-12-08 22:10:23 UTC (rev 2816)
@@ -1,7 +1,6 @@
-=== modified file 'mixxx/build/depends.py'
---- mixxx/build/depends.py 2013-01-19 09:47:43 +0000
-+++ mixxx/build/depends.py 2013-02-06 00:25:30 +0000
-@@ -290,25 +290,10 @@
+--- mixxx-9999/build/depends.py
++++ mixxx-9999/build/depends.py
+@@ -317,26 +317,10 @@ class Qt(Dependence):
class FidLib(Dependence):
@@ -24,21 +23,22 @@
-
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):
-@@ -319,7 +304,6 @@
- build.env.Append(CPPPATH="#lib/replaygain")
+@@ -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))
-@@ -328,30 +312,7 @@
+@@ -357,30 +340,7 @@ class SoundTouch(Dependence):
(build.toolchain_is_gnu and optimize > 1))
def sources(self, build):
@@ -64,21 +64,20 @@
- if self.sse_enabled(build):
- sources.extend(
- ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
-- '#lib/%s/sse_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:
-@@ -359,13 +320,10 @@
+@@ -388,12 +348,11 @@ class SoundTouch(Dependence):
if build.platform_is_windows:
# Regardless of the bitwidth, ST checks for WIN32
- env.Append(CPPDEFINES = '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']):
@@ -86,40 +85,40 @@
+ build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
+ build.env.Append(LIBS='SoundTouch')
- class TagLib(Dependence):
- def configure(self, build, conf):
+
+ class RubberBand(Dependence):
-=== modified file 'mixxx/build/features.py'
---- mixxx/build/features.py 2012-11-22 14:14:06 +0000
-+++ mixxx/build/features.py 2013-02-06 00:54:37 +0000
-@@ -48,7 +48,6 @@
- 'controllers/midi/hss1394enumerator.cpp']
+
+--- mixxx-9999/build/features.py
++++ mixxx-9999/build/features.py
+@@ -54,7 +54,6 @@ class HSS1394(Feature):
+
class HID(Feature):
- HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
+
def description(self):
return "HID controller support"
-
-@@ -64,9 +63,6 @@
+@@ -71,10 +70,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')])
+- 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.ParseConfig(
+@@ -96,22 +91,16 @@ class HID(Feature):
- build.env.Append(CPPDEFINES = '__HID__')
+ 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',
@@ -128,22 +127,26 @@
- 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"))
+- 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'))
+- 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'))
+- sources.append(
+- os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
return sources
- class Bulk(Feature):
-@@ -722,25 +716,15 @@
- test_env.Append(CCFLAGS = '-pthread')
- test_env.Append(LINKFLAGS = '-pthread')
+@@ -817,26 +806,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")
-- #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
-- #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin' # example, optional
+- # 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
@@ -153,28 +156,27 @@
- # 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'))
+- # 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')
-+
+
+- 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):
- def description(self):
-=== modified file 'mixxx/src/engine/enginefilter.h'
---- mixxx/src/engine/enginefilter.h 2011-07-24 21:50:31 +0000
-+++ mixxx/src/engine/enginefilter.h 2013-02-06 00:34:16 +0000
+
+--- mixxx-9999/src/engine/enginefilter.h
++++ mixxx-9999/src/engine/enginefilter.h
@@ -20,7 +20,7 @@
#define MIXXX
@@ -183,18 +185,17 @@
+#include <fidlib.h>
#include "defs.h"
- enum filterType{
+ #define PREDEF_HP 1
-=== modified file 'mixxx/src/engine/enginefilterbutterworth8.cpp'
---- mixxx/src/engine/enginefilterbutterworth8.cpp 2011-07-24 21:50:31 +0000
-+++ mixxx/src/engine/enginefilterbutterworth8.cpp 2013-02-06 00:34:01 +0000
-@@ -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 <fidlib.h>
-
- /* Local Prototypes */
- inline double _processLowpass(double *coef, double *buf, register double val);
+--- mixxx-9999/src/engine/enginefilterbutterworth8.cpp
++++ mixxx-9999/src/engine/enginefilterbutterworth8.cpp
+@@ -18,7 +18,7 @@
+ #include "engine/enginefilterbutterworth8.h"
+ #include "engine/enginefilter.h"
+ #include "engine/engineobject.h"
+-#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);
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2013-12-08 21:09:33 UTC (rev 2815)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2013-12-08 22:10:23 UTC (rev 2816)
@@ -37,6 +37,7 @@
dev-qt/qtopengl:4
dev-qt/qtsql:4
dev-qt/qtsvg:4
+ dev-qt/qttest:4
dev-qt/qtwebkit:4
dev-qt/qtxmlpatterns:4
aac? (
@@ -58,7 +59,6 @@
epatch "${FILESDIR}"/${P}-cflags.patch
epatch "${FILESDIR}"/${P}-system-libs.patch
epatch "${FILESDIR}"/${P}-docs.patch
- epatch "${FILESDIR}"/${P}-no-bzr.patch
# use multilib compatible directory for plugins
sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die