| [proaudio] [2732] media-sound/mixxx: New version, eapi 5, respect EPREFIX, add dependencies, hid use flag, update patches, thanks to Alex Barker |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2732
Author: lilrc
Date: 2013-05-23 11:47:48 +0200 (Thu, 23 May 2013)
Log Message:
-----------
media-sound/mixxx: New version, eapi 5, respect EPREFIX, add dependencies, hid use flag, update patches, 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-1.11.9999-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/metadata.xml
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild
trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-docs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.0.ebuild
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2013-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2013-05-23 09:47:48 UTC (rev 2732)
@@ -2,6 +2,23 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*mixxx-1.11.0 (23 May 2013)
+
+ 23 May 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ +mixxx-1.11.0.ebuild, mixxx-1.11.9999.ebuild, mixxx-9999.ebuild,
+ +files/mixxx-1.11.0-cflags.patch, +files/mixxx-1.11.0-docs.patch,
+ +files/mixxx-1.11.0-no-bzr.patch, +files/mixxx-1.11.0-system-libs.patch,
+ files/mixxx-1.11.9999-no-bzr.patch, files/mixxx-1.11.9999-system-libs.patch,
+ files/mixxx-9999-no-bzr.patch, files/mixxx-9999-system-libs.patch,
+ metadata.xml:
+ Move to EAPI 5.
+ Respect EPREFIX.
+ Use an array for the arguments to escons.
+ Added missing dependencies.
+ Added a hid USE flag.
+ All patches now work.
+ Thanks a lot to Alex Barker for submitting his work on the ML.
+
10 Mar 2013; Dominique Michel <dominique@xxxxxxxxxxxxx>
mixx-1.11.9999.ebuild, mixx-9999.ebuild: Commented out system-libs.patch
that doesn't apply anymore.
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2013-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2013-05-23 09:47:48 UTC (rev 2732)
@@ -1,12 +1,18 @@
+AUX mixxx-1.11.0-cflags.patch 641 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549 SHA512 8fcd2ba6dba5fb3b0e0a0058b965fe25b6c34b1d787d1d920666f9426ffffc84253913ef5b606e14fd4b0f5dfb26bfeb04d4424c856fe7d57e62b837144dab37 WHIRLPOOL 8528a3ee74925a4e338fed9b9d803944cd001ef3f385892fc1d1abfdaab462f1118a3365599572005f9795a9763fdcb4345e9d9f008cacfcbba7d0f6751fbfa7
+AUX mixxx-1.11.0-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
+AUX mixxx-1.11.0-no-bzr.patch 1468 SHA256 9552c578c02ad5a2654f2d6bd8ce45e3daa790e070638579a0eb60b497c0f6f6 SHA512 4d3f12b60cb15d5e12c17f89d4f17ab5f0f57692e499e3778008d94c5e362c5c450e7d4d4ee29a80c9581bbfd6a845ad58a44f3c1579c761d6b847d70767a104 WHIRLPOOL d6d0500d944b306ebfd35bb209122f9e08a9a051a5db83efbae4beb708567d542c59ebde9d3798509aaf4078d9668fa7bcb5de652f6035b155d24b28617343cb
+AUX mixxx-1.11.0-system-libs.patch 8072 SHA256 996c6a170e06a5b4b0250f6fcefd80be8cb6d51325ee19c231360f1892567cb1 SHA512 d8d6ab9162b365288e224bfe2611c3322d539e35284c26ede0c829a29508a1047ad8e28c08bc769a0c72bfc70e69ebca71ac8e0217fb78c5904582153c1ae267 WHIRLPOOL 0fffac4355f882e01fefaaca19cdbf9cc048d1ef6892f2451c7e7163ad19fa17e41685980acb8cd62d4530010f3ec88db8962827d35fb9f9ec5ff564adaafa89
AUX mixxx-1.11.9999-cflags.patch 641 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549 SHA512 8fcd2ba6dba5fb3b0e0a0058b965fe25b6c34b1d787d1d920666f9426ffffc84253913ef5b606e14fd4b0f5dfb26bfeb04d4424c856fe7d57e62b837144dab37 WHIRLPOOL 8528a3ee74925a4e338fed9b9d803944cd001ef3f385892fc1d1abfdaab462f1118a3365599572005f9795a9763fdcb4345e9d9f008cacfcbba7d0f6751fbfa7
AUX mixxx-1.11.9999-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
-AUX mixxx-1.11.9999-no-bzr.patch 1468 SHA256 9552c578c02ad5a2654f2d6bd8ce45e3daa790e070638579a0eb60b497c0f6f6 SHA512 4d3f12b60cb15d5e12c17f89d4f17ab5f0f57692e499e3778008d94c5e362c5c450e7d4d4ee29a80c9581bbfd6a845ad58a44f3c1579c761d6b847d70767a104 WHIRLPOOL d6d0500d944b306ebfd35bb209122f9e08a9a051a5db83efbae4beb708567d542c59ebde9d3798509aaf4078d9668fa7bcb5de652f6035b155d24b28617343cb
-AUX mixxx-1.11.9999-system-libs.patch 6157 SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd SHA512 54d60392424e3809054685a595290f713c3688c3558b09ac082204f2da015c91c99ea455f6393ab31d846d7821050e352a77193e3f91813aab83bff291223a50 WHIRLPOOL fd254234b439ffc72eade2cea5cb32fc0fc3921c94fc47c64cb83b4cf5efb71c277257538b18e123d4c587edbe5556e729112fd68d085161f1c6d271c40ad768
+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-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
-AUX mixxx-9999-no-bzr.patch 1468 SHA256 9552c578c02ad5a2654f2d6bd8ce45e3daa790e070638579a0eb60b497c0f6f6 SHA512 4d3f12b60cb15d5e12c17f89d4f17ab5f0f57692e499e3778008d94c5e362c5c450e7d4d4ee29a80c9581bbfd6a845ad58a44f3c1579c761d6b847d70767a104 WHIRLPOOL d6d0500d944b306ebfd35bb209122f9e08a9a051a5db83efbae4beb708567d542c59ebde9d3798509aaf4078d9668fa7bcb5de652f6035b155d24b28617343cb
-AUX mixxx-9999-system-libs.patch 6157 SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd SHA512 54d60392424e3809054685a595290f713c3688c3558b09ac082204f2da015c91c99ea455f6393ab31d846d7821050e352a77193e3f91813aab83bff291223a50 WHIRLPOOL fd254234b439ffc72eade2cea5cb32fc0fc3921c94fc47c64cb83b4cf5efb71c277257538b18e123d4c587edbe5556e729112fd68d085161f1c6d271c40ad768
-EBUILD mixxx-1.11.9999.ebuild 2149 SHA256 8e8d9b4ec7ce99aea4df04cef50d3de2f255240982e119779cedd389a7a011df SHA512 e2c512478feaa3b8911fd746ea7c57e21a9a32d29e964d52997ce3dbfa5593b3464de27d1a71d45bf2286941f2c4a3aa27ba022d51f0bcad3c2dbb513a075d50 WHIRLPOOL 099b860b69aff16a1359507a57c36f30bfb7f0aa34cb19a6a1008b443528e99680a8eb8ed5d6123777ab26671d1f93b61e22ab39281e066174df527c45e10f4c
-EBUILD mixxx-9999.ebuild 2143 SHA256 018cf6701e8624a282a08e3ed5ad4b285164788ec89d4e60e0abf7c2340bad30 SHA512 4bbae9ab54c42b2951339444d6779752fd1c4663efc7e85e6d98cece262f94184cc906b3645e42685274b4b7596e8d1f600c0f86d67e3d178c2e913b7906d708 WHIRLPOOL a9955042bfcdbf113f79121bcedd8b86b4b62ad69e323be485712115232123af13b1017558cb82cd4125902c7e1de59bd5c98d7a7b74221086b6de7f1c318967
-MISC ChangeLog 5431 SHA256 9aaf1a03dc95f343a440fafb2baf40f0873bcee159ec48123489191f3d4afdc8 SHA512 77072fc905a6289d4ecc891c07eb922862a60b4eacca72fe72878bf65037a253f4adc739ecfbfe4183a595163eb1ad5ab33d3dfdeb9f37f28852d8f4821635fe WHIRLPOOL 2998a0cee4d691d23bfdd452bcb2fb8e8699bc52076db414631df9cc477423db8bc3158d267b9dfcaf2f3b4bf74374706e4079deb40ac12f26e4011fb06080df
-MISC metadata.xml 425 SHA256 e49f5f6ac6a5dcbfb49800c089466af9d56c900a798b53c7c89e47ef6f7d3bde SHA512 5cf183c20b628ca8c2809b036cbd5bce28cf3bba582a8bf538120d5a464dbac300bcc0b23320d3786c54cf0dd273b448851b8913715c1143d22c2e37fe289483 WHIRLPOOL 0c12b3fc23b5ddd225af0f3fa43c50ce265c1ed9f84b445ccb509b64a29e247271026ea813774738599a9ff790cf500c10c9038a6cb924331dce4e1221c80f95
+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
+DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1
+EBUILD mixxx-1.11.0.ebuild 2275 SHA256 7d244772ffe10fab1a1bbbda1da69a98239a25e2574c04cd3a40ffa16c7f1c36 SHA512 d0eb33e1a09a45b1e557976fa3899e3d325d36c06c26cd12dacb9c96ae183b16be3666d1c92fe16864652a0da8fc7bacc8e0e6a14d5b9dbb006c14b5d04976e8 WHIRLPOOL a536cb15e7544857c6c9f24f39c40fe451e39d03482422709ada6ed59d2173b14be900f3b8e8dd4da0d23dd8d19547b65bf7d056b75485e23eb36785e938df88
+EBUILD mixxx-1.11.9999.ebuild 2235 SHA256 c60845f8b858009f1a2f75f67251c615bf3a6c8698844596f7b53bb85d00a917 SHA512 a62227a4c01d2a8c9651204aac8fec5f7dcc3246d276364dc57eb9803eb078a382d21fcc98023fa6925379c17a5160f1676110af3727c38aa86b98c2c5bed525 WHIRLPOOL 61884b14fda31f98f1637dadba8483d2af6ac5dfeea1b9346775f6b187096ef90b433e8373d178f1770a7b48b05cd30201c2703e9e7efe2920089a4991d8ae03
+EBUILD mixxx-9999.ebuild 2273 SHA256 70162fba55c3158263d5a812c032b86d1c2929496ba3579d11bed82a1a5a0785 SHA512 5818b65cdc2e3051887849893257f673523ce41d3c73e4585db3e442f9e022472be8ea857faa544327ff468fc98120ab506a9941506a3c88d69d6302fc9117ed WHIRLPOOL b61f7bdfb0ef74744753b54192453c6c4cbf75e00781f393e12941acdef3f26cd8c44b744066edf4c7a8015f6a80e7a058b230d32cbbd3a7b767dccf47682e13
+MISC ChangeLog 6124 SHA256 4678beb53d0bf68d87ba7567e52044a4834444fd49fd647b9b071517ea0f00a6 SHA512 135f2a7f37be8a48d41739e74953de49aaa66462dbcf24d2e5e1cc70f1b769be542b0a2bb2ce5411346d506db24a96b0a4dc8fb1cc5a996266aa9c6a6ca4e39c WHIRLPOOL 831492c9ad589b07ea537dab72d5c734eb35b95e4cf7c0298c43641b78054a3ba3f4392040ea49b30ee22a9d8a6a076e3aade2c9b07e74b20ae077d37e1e853a
+MISC metadata.xml 485 SHA256 2d28e5b3222a404cd0ae26b12d70640ed15c665204a43496862b77f0396f2038 SHA512 cf3578bae5e75f6b5db4ca71cd00a9389878d87d0983b0c5e0b2858336bd30186df13c58b03b9f1f2e698b651d360058ed0ff63771be6ba98128ae30b886d7f7 WHIRLPOOL 275c04e470f80968e15e0c3ef77cfa4f6fe89917b01ce1d94ea7bebdfd30ee54baae32678d79e7d28dde24bd0f4ad1f8756f185638e77421ab22ebca8e42c555
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-cflags.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-cflags.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -0,0 +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 @@
+ 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
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-docs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-docs.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -0,0 +1,10 @@
+--- mixxx-9999/src/SConscript
++++ mixxx-9999/src/SConscript
+@@ -223,7 +223,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)
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -0,0 +1,37 @@
+--- mixxx/src/SConscript 2012-09-07 21:48:19 +0000
++++ mixxx/src/SConscript 2012-09-13 04:47:25 +0000
+@@ -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/src/SConscript.env 2012-09-06 08:04:47 +0000
++++ mixxx/src/SConscript.env 2012-09-13 04:46:47 +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']):
+
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -0,0 +1,200 @@
+=== 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 @@
+
+ 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):
+
+@@ -319,7 +304,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))
+@@ -328,30 +312,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:
+@@ -359,13 +320,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):
+
+=== 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']
+
+ 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):
+@@ -722,25 +716,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):
+
+=== 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
+@@ -20,7 +20,7 @@
+
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.10/fidlib.h"
++#include <fidlib.h>
+ #include "defs.h"
+
+ enum filterType{
+
+=== 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);
+
Modified: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch 2013-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -1,5 +1,5 @@
---- mixxx/src/SConscript 2012-09-07 21:48:19 +0000
-+++ mixxx/src/SConscript 2012-09-13 04:47:25 +0000
+--- mixxx/src/SConscript 2013-05-20 20:40:21 +0000
++++ mixxx/src/SConscript 2013-05-22 02:58:18 +0000
@@ -12,8 +12,8 @@
from build import util, depends
@@ -13,7 +13,7 @@
plugins = []
--- mixxx/src/SConscript.env 2012-09-06 08:04:47 +0000
-+++ mixxx/src/SConscript.env 2012-09-13 04:46: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)
Modified: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch 2013-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -1,7 +1,7 @@
=== modified file 'mixxx/build/depends.py'
---- mixxx-9999/build/depends.py 2012-04-22 17:33:25 +0000
-+++ mixxx-9999/build/depends.py 2012-04-23 23:49:03 +0000
-@@ -189,25 +189,10 @@
+--- 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 @@
class FidLib(Dependence):
@@ -30,7 +30,7 @@
class ReplayGain(Dependence):
-@@ -218,7 +203,6 @@
+@@ -319,7 +304,6 @@
build.env.Append(CPPPATH="#lib/replaygain")
class SoundTouch(Dependence):
@@ -38,7 +38,7 @@
def sse_enabled(self, build):
optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -227,42 +211,13 @@
+@@ -328,30 +312,7 @@
(build.toolchain_is_gnu and optimize > 1))
def sources(self, build):
@@ -68,17 +68,19 @@
- return sources
+ return ['engine/enginebufferscalest.cpp']
- def configure(self, build, conf):
-- if build.platform_is_windows:
-- # Regardless of the bitwidth, ST checks for WIN32
-- build.env.Append(CPPDEFINES = 'WIN32')
-- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+ def configure(self, build, conf, env=None):
+ if env is None:
+@@ -359,13 +320,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(build.env, 'optimize', 1))
+- optimize = int(util.get_flags(env, 'optimize', 1))
- if self.sse_enabled(build):
-- build.env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
+- 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'])
@@ -87,9 +89,54 @@
class TagLib(Dependence):
def configure(self, build, conf):
---- mixxx-9999/build/features.py 2011-12-08 11:47:54 +0000
-+++ mixxx-9999/build/features.py 2012-03-21 20:41:47 +0000
-@@ -595,25 +595,15 @@
+=== 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']
+
+ 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):
+@@ -722,25 +716,15 @@
test_env.Append(CCFLAGS = '-pthread')
test_env.Append(LINKFLAGS = '-pthread')
@@ -125,25 +172,28 @@
class Shoutcast(Feature):
def description(self):
---- mixxx-9999/src/engine/enginefilter.h 2011-07-24 21:50:31 +0000
-+++ mixxx-9999/src/engine/enginefilter.h 2012-03-21 20:41:47 +0000
+=== 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
@@ -20,7 +20,7 @@
#define MIXXX
#include "engine/engineobject.h"
-#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include "fidlib.h"
++#include <fidlib.h>
#include "defs.h"
enum filterType{
---- mixxx-9999/src/engine/enginefilterbutterworth8.cpp 2011-07-24 21:50:31 +0000
-+++ mixxx-9999/src/engine/enginefilterbutterworth8.cpp 2012-03-21 20:41:47 +0000
-@@ -20,7 +20,6 @@
+=== 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);
Modified: 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-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -1,19 +1,23 @@
---- mixxx/src/SConscript 2012-09-07 21:48:19 +0000
-+++ mixxx/src/SConscript 2012-09-13 04:47:25 +0000
-@@ -12,8 +12,8 @@
+=== 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_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
+-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
- plugins = []
+=== modified file 'mixxx/src/SConscript.env'
--- mixxx/src/SConscript.env 2012-09-06 08:04:47 +0000
-+++ mixxx/src/SConscript.env 2012-09-13 04:46: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)
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-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-system-libs.patch 2013-05-23 09:47:48 UTC (rev 2732)
@@ -1,7 +1,7 @@
=== modified file 'mixxx/build/depends.py'
---- mixxx-9999/build/depends.py 2012-04-22 17:33:25 +0000
-+++ mixxx-9999/build/depends.py 2012-04-23 23:49:03 +0000
-@@ -189,25 +189,10 @@
+--- 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 @@
class FidLib(Dependence):
@@ -30,7 +30,7 @@
class ReplayGain(Dependence):
-@@ -218,7 +203,6 @@
+@@ -319,7 +304,6 @@
build.env.Append(CPPPATH="#lib/replaygain")
class SoundTouch(Dependence):
@@ -38,7 +38,7 @@
def sse_enabled(self, build):
optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -227,42 +211,13 @@
+@@ -328,30 +312,7 @@
(build.toolchain_is_gnu and optimize > 1))
def sources(self, build):
@@ -68,17 +68,19 @@
- return sources
+ return ['engine/enginebufferscalest.cpp']
- def configure(self, build, conf):
-- if build.platform_is_windows:
-- # Regardless of the bitwidth, ST checks for WIN32
-- build.env.Append(CPPDEFINES = 'WIN32')
-- build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+ def configure(self, build, conf, env=None):
+ if env is None:
+@@ -359,13 +320,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(build.env, 'optimize', 1))
+- optimize = int(util.get_flags(env, 'optimize', 1))
- if self.sse_enabled(build):
-- build.env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
+- 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'])
@@ -87,9 +89,54 @@
class TagLib(Dependence):
def configure(self, build, conf):
---- mixxx-9999/build/features.py 2011-12-08 11:47:54 +0000
-+++ mixxx-9999/build/features.py 2012-03-21 20:41:47 +0000
-@@ -595,25 +595,15 @@
+=== 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']
+
+ 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):
+@@ -722,25 +716,15 @@
test_env.Append(CCFLAGS = '-pthread')
test_env.Append(LINKFLAGS = '-pthread')
@@ -125,25 +172,28 @@
class Shoutcast(Feature):
def description(self):
---- mixxx-9999/src/engine/enginefilter.h 2011-07-24 21:50:31 +0000
-+++ mixxx-9999/src/engine/enginefilter.h 2012-03-21 20:41:47 +0000
+=== 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
@@ -20,7 +20,7 @@
#define MIXXX
#include "engine/engineobject.h"
-#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include "fidlib.h"
++#include <fidlib.h>
#include "defs.h"
enum filterType{
---- mixxx-9999/src/engine/enginefilterbutterworth8.cpp 2011-07-24 21:50:31 +0000
-+++ mixxx-9999/src/engine/enginefilterbutterworth8.cpp 2012-03-21 20:41:47 +0000
-@@ -20,7 +20,6 @@
+=== 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);
Modified: trunk/overlays/proaudio/media-sound/mixxx/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/metadata.xml 2013-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/metadata.xml 2013-05-23 09:47:48 UTC (rev 2732)
@@ -6,6 +6,7 @@
<name>pro-audio overlay team</name>
</maintainer>
<use>
+ <flag name="hid">Build with HID controller support</flag>
<flag name="pulseaudio">Disables <pkg>media-sound/pulseaudio</pkg> support for mixxx with pasuspender</flag>
<flag name="shout">Enable shoutcast support</flag>
</use>
Added: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.0.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.0.ebuild 2013-05-23 09:47:48 UTC (rev 2732)
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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.${PN}.org/${P}/${P}-src.tar.gz";
+
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac debug doc hid mp3 mp4 pulseaudio shout wavpack"
+
+RDEPEND="dev-libs/protobuf
+ >=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
+ media-libs/vamp-plugin-sdk
+ 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
+ )
+ hid? ( dev-libs/hidapi )
+ mp3? ( media-libs/libmad )
+ mp4? ( media-libs/libmp4v2 )
+ pulseaudio? ( media-sound/pulseaudio )
+ shout? ( media-libs/libshout )
+ wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ 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
+
+ # alter startup command when pulseaudio support is disabled
+ if ! use pulseaudio ; then
+ sed -i -e '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)
+ )
+}
+
+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 \
+ install_root="${ED}"/usr
+
+ dodoc README Mixxx-Manual.pdf
+}
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild 2013-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild 2013-05-23 09:47:48 UTC (rev 2732)
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit bzr eutils multilib scons-utils toolchain-funcs
@@ -13,10 +13,10 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="aac debug doc mp3 mp4 pulseaudio shout wavpack"
+IUSE="aac debug doc hid mp3 mp4 pulseaudio shout wavpack"
RDEPEND="dev-libs/protobuf
- media-libs/fidlib
+ >=media-libs/fidlib-0.9.10-r1
media-libs/flac
media-libs/libid3tag
media-libs/libogg
@@ -39,6 +39,7 @@
media-libs/faad2
media-libs/libmp4v2:0
)
+ hid? ( dev-libs/hidapi )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
pulseaudio? ( media-sound/pulseaudio )
@@ -51,8 +52,7 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-cflags.patch
- # doesn't apply anymore
-# epatch "${FILESDIR}"/${P}-system-libs.patch
+ epatch "${FILESDIR}"/${P}-system-libs.patch
epatch "${FILESDIR}"/${P}-docs.patch
epatch "${FILESDIR}"/${P}-no-bzr.patch
@@ -65,27 +65,32 @@
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)
+ )
+}
+
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 mp4 m4a) \
- $(use_scons shout shoutcast) \
- $(use_scons wavpack wv)
+ LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons
}
src_install() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
- LIBPATH="/usr/$(get_libdir)" escons install \
- prefix=/usr \
- install_root="${D}"/usr
+ LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons \
+ install_root="${ED}"/usr install
dodoc README Mixxx-Manual.pdf
}
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2013-05-19 10:07:13 UTC (rev 2731)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2013-05-23 09:47:48 UTC (rev 2732)
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit bzr eutils multilib scons-utils toolchain-funcs
@@ -13,10 +13,11 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="aac debug doc mp3 mp4 pulseaudio shout wavpack"
+IUSE="aac debug doc hid mp3 mp4 pulseaudio shout wavpack"
RDEPEND="dev-libs/protobuf
- media-libs/fidlib
+ media-libs/chromaprint
+ >=media-libs/fidlib-0.9.10-r1
media-libs/flac
media-libs/libid3tag
media-libs/libogg
@@ -27,6 +28,7 @@
media-libs/portmidi
media-libs/taglib
media-libs/vamp-plugin-sdk
+ sci-libs/fftw:3.0
virtual/glu
virtual/opengl
dev-qt/qtgui:4
@@ -39,6 +41,7 @@
media-libs/faad2
media-libs/libmp4v2:0
)
+ hid? ( dev-libs/hidapi )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
pulseaudio? ( media-sound/pulseaudio )
@@ -51,8 +54,7 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-cflags.patch
- #Doesn't apply anymore
-# epatch "${FILESDIR}"/${P}-system-libs.patch
+ epatch "${FILESDIR}"/${P}-system-libs.patch
epatch "${FILESDIR}"/${P}-docs.patch
epatch "${FILESDIR}"/${P}-no-bzr.patch
@@ -65,27 +67,32 @@
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)
+ )
+}
+
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 mp4 m4a) \
- $(use_scons shout shoutcast) \
- $(use_scons wavpack wv)
+ LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons
}
src_install() {
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
- LIBPATH="/usr/$(get_libdir)" escons install \
- prefix=/usr \
- install_root="${D}"/usr
+ LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons install \
+ install_root="${ED}"/usr
dodoc README Mixxx-Manual.pdf
}