| [proaudio] [2197] Various fixes from Alex Barker |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2197
Author: dominique
Date: 2012-08-11 19:06:14 +0200 (Sat, 11 Aug 2012)
Log Message:
-----------
Various fixes from Alex Barker
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
trunk/overlays/proaudio/media-sound/mixxx/Manifest
trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch
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/mixxx-1.11.9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-docs.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-no-bzr.patch
trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild
trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-08-11 17:06:14 UTC (rev 2197)
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Aug 2012; Dominique Michel <dominique@xxxxxxxxxxxxx>
+ -mixxx-1.10.ebuild: removed outdated version
+ +mixxx-1.11.9999.ebuild, -mixxx-1.10.9999.ebuild: bumped live ebuild
+ mixxx-9999.ebuild: dependencies fix
+ Thanks to Alex Barker for those fixes
+
25 May 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx> mixxx-1.10.0.ebuild:
mixxx-1.10.0: missing fidlib dependency added wrt bug report at f.g.o. by
woelfl
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,21 +1,12 @@
-AUX mixxx-1.10.0-cflags.patch 573 RMD160 66a06953f624879241fa0b434ee43b0930f3ec4f SHA1 4ce1d76897ae1ab1fa3b2d65853d09a8eb993a04 SHA256 2e37a38c7ac7fa14e495b999b9e81d9a10ea2aa36ec1f17142e3299c91d4f738
-AUX mixxx-1.10.0-docs.patch 327 RMD160 bdb7680df3519667c84464bf1250a1d3517dc4d1 SHA1 fcc69619870f6b536b6a276edfe0297f0d05b552 SHA256 d092d360ccc533f1fa57d39577cd2fffb6089461744844ac3df3d4a0a60280bf
-AUX mixxx-1.10.0-libmp4v2_r479_compat.patch 934 RMD160 766ad0f3124a3713711a67c357536c93f27b010a SHA1 17f24f924082cfc59c5b8309228b3107416259a6 SHA256 42ac5344d5544bbb42bbb6bc67ace8e61a409ebad8a5c17adc30ae140308124d
-AUX mixxx-1.10.0-m4a.patch 698 RMD160 31bdef217bac38c48e89a5b6aecbfc657b55deb6 SHA1 1f2b4b3230b4d6ecdff78ad6eca2565a18443471 SHA256 0acb50575bfd2c6682b4d28ad3df42357561e62412b93d065e66011d4268dcf1
-AUX mixxx-1.10.0-no-bzr.patch 1503 RMD160 e4438b5ecd9a4175ebfce7d564ee927fc32ed611 SHA1 7579e8c7a9ed3c62f05484c7f424d7874f7c77f3 SHA256 7584acf4623f2dbbb70b675675242fe528729bf9d39c3eadff4fff87650f157c
-AUX mixxx-1.10.0-system-libs.patch 7152 RMD160 997fc54491efa54d9aec7f77e0fba40b1ce21f5e SHA1 2d3bf891ce824b1dede101ab9512639c7947929d SHA256 c3809896e75c6c4e5e714e75527ec5a970edca5e75124fa06bbe02fb9b08b0a1
-AUX mixxx-1.10.0-wavpack.patch 2020 RMD160 708427c50256f2fa9f0e9eaa2f5717cb46aacbb9 SHA1 707a120641681821f8f278bdd89171313feebd9f SHA256 5589578406062f11f426401262d6198777b68d52595618071a2fa7203ff3112b
-AUX mixxx-1.10.9999-cflags.patch 655 RMD160 e0a6792f5dd5634bae9f7ca3788935d29580b0b4 SHA1 ffa393ac5ab3609273ee9ddaf80386447fdbf19a SHA256 99804e3fa036a7bfdcafafbfc1451e370ea29a1c41448a8e35dee65499e77525
-AUX mixxx-1.10.9999-docs.patch 407 RMD160 d6339919d3634a700d21968c5e6ce0075ac210c9 SHA1 1e2a98febbb63375c10523512ff3c379b400f49b SHA256 b03ac370db5e59cf32801df17bdb5f605a5be2894f0ef06293d9dae4325dd650
-AUX mixxx-1.10.9999-no-bzr.patch 1667 RMD160 da949f6c6c2331997e3b899aa5eaa89d02f459b4 SHA1 a3967d286167a72a810f0328b32d304dc36cfcee SHA256 eb4e734e1c265833806f21b59abb35cc20379710bc7be353b701a4c1970112f2
-AUX mixxx-1.10.9999-system-libs.patch 7253 RMD160 279d4ea995ec4de3ba63365f6f249cd0f062ab1a SHA1 2344bb14544b41b14b2e5801c9279b809d96167b SHA256 f943697e197541ef18aa875f1a5a88a4be373a00f3bc16178854c5e286550af5
-AUX mixxx-9999-cflags.patch 641 RMD160 53c31d4ef1ce971ca57a4fc08ab25c13b33f445c SHA1 7b49db41361db9dfaf462987a9aa1f87f8fea2a9 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549
-AUX mixxx-9999-docs.patch 438 RMD160 8ad7e74e3c56ffd5b22045d19fe09f6505d7ae28 SHA1 d49f5fc77b8bd5d4f9a2547af8cee319574cc04e SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7
-AUX mixxx-9999-no-bzr.patch 1496 RMD160 2f10537abe9fe373d791e77984c3abc1b9f7f82c SHA1 245b85509d038ada45612c64781875e049331b61 SHA256 b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0
-AUX mixxx-9999-system-libs.patch 6157 RMD160 944982b976ecd5d22f9f2caf53f24836c9240ac1 SHA1 3a25864da30e38410ac8ddb093f70aa479aa0e8e SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd
-DIST mixxx-1.10.0-src.tar.gz 15852338 RMD160 dde454d7ff6200e33c401e87313ad399ff751d53 SHA1 b01ab69c0eeca99fa6b1da472cfede01bda71328 SHA256 9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97
-EBUILD mixxx-1.10.0.ebuild 2461 RMD160 c863f6fd0f56dd0f88641a5459b68d6d229d0fa6 SHA1 3298d6c219d63a1e2cf37a0293f954f967c9c04b SHA256 d0fd5156954df7b5f7dda20dcbf876518272d7eb019ca2e7965ba1656adbb0f7
-EBUILD mixxx-1.10.9999.ebuild 2176 RMD160 fa505817eaa1c9817328a6ff3b105ca2d9e88721 SHA1 ca598c3b21d909ea428ed459a6e925d3a819d94f SHA256 34bbd912742af4ff02a4657338e3ee2ef50749bbd765ea17e72fe865cac1f27d
-EBUILD mixxx-9999.ebuild 2153 RMD160 442443d09404f3a8ac85eb01ba3991eae2c0497b SHA1 63153e583cfe68b726678ec3076df0873c789a77 SHA256 959eeb5c3446c5fa23ce43808fbb834249624fb1204ed896b0c4c32a59f42673
-MISC ChangeLog 4484 RMD160 8121d45b2beab52a7e51be7a0a19da03061a93b1 SHA1 e5841f0c651c838e2d93191180393c3d320ad859 SHA256 fb0b6932c80f1f906f432219123b7be74784b6c9f527e5fab1cb2dd3cb539820
-MISC metadata.xml 754 RMD160 3a4507c7280aeba4befbf07479cc3149526ec968 SHA1 07e5cb6c41989b25648616b5e0fc702addb8e312 SHA256 83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141
+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 1496 SHA256 b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0 SHA512 16ce2b20dc0fbd916f134926c997911b6f1a83f84b19f01feff5bc4d5237f7f1c2741ffd6adfb851abef04b9ed27538869337060f6e12707b8ec693a0e51ed4d WHIRLPOOL 3e39d2469b464fd4490f42eb306fc4651f456eedb5c62fbcaab883a14d5ce252daeab1a673a23ac2271196b46760a9fd512fc5ddc1614b3f2282719383d25594
+AUX mixxx-1.11.9999-system-libs.patch 6157 SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd SHA512 54d60392424e3809054685a595290f713c3688c3558b09ac082204f2da015c91c99ea455f6393ab31d846d7821050e352a77193e3f91813aab83bff291223a50 WHIRLPOOL fd254234b439ffc72eade2cea5cb32fc0fc3921c94fc47c64cb83b4cf5efb71c277257538b18e123d4c587edbe5556e729112fd68d085161f1c6d271c40ad768
+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 1496 SHA256 b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0 SHA512 16ce2b20dc0fbd916f134926c997911b6f1a83f84b19f01feff5bc4d5237f7f1c2741ffd6adfb851abef04b9ed27538869337060f6e12707b8ec693a0e51ed4d WHIRLPOOL 3e39d2469b464fd4490f42eb306fc4651f456eedb5c62fbcaab883a14d5ce252daeab1a673a23ac2271196b46760a9fd512fc5ddc1614b3f2282719383d25594
+AUX mixxx-9999-system-libs.patch 6157 SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd SHA512 54d60392424e3809054685a595290f713c3688c3558b09ac082204f2da015c91c99ea455f6393ab31d846d7821050e352a77193e3f91813aab83bff291223a50 WHIRLPOOL fd254234b439ffc72eade2cea5cb32fc0fc3921c94fc47c64cb83b4cf5efb71c277257538b18e123d4c587edbe5556e729112fd68d085161f1c6d271c40ad768
+EBUILD mixxx-1.11.9999.ebuild 2274 SHA256 2f0df1ddaeb9ecf35d3f1a8b834dfe455f96ff495e3a7c1eb2034feefad6a949 SHA512 94f570cdf2bb6d97ae3a4037cb50a1869c4ed700d09b70fc745307ba16b81bb8d761eb931cefa3c587fc029cd6bdd26a5c990198e80545902c3a5205d3eb1c36 WHIRLPOOL 76b0fc3787ebb682b211c27a0029ed03986dd86b9a3a886ddf5972d05df9710c20616f3f20432d69a044ea335309072beec94ac82347c139f7a1dd7b3f3ca922
+EBUILD mixxx-9999.ebuild 2269 SHA256 98bd10635d76e715ce6a2bd0cba85b7e7406521f0ef9981488056a74355a87ca SHA512 c6077d9ae6a9ad27e15cf628eb898813c1502f7aab43100ba0f2907a5f8a55ca042444989866ef77fc0d342becdee79f94438667664b259b298efbb7f5b50629 WHIRLPOOL a239d8c23cb9dcde14c1d417106e46a5eaea9af944fc04a978c77940da0b10edd6020430639ecabdbbe649f474a6960fb63f54a5223985e4f106e3b7eb59980e
+MISC ChangeLog 4739 SHA256 950e5620b66b51d949dd4ec6399be7b1c733598c69dfa6517a5808a735cd4de1 SHA512 d81e97577ca6c72f77333db4b48bbe989f4e2ff1284a9177eed776b6d9cdc08c4e23ebe400a3ad3412bab8dd6b3caf2cc9712c69d5e0f90c75e20cb420431c82 WHIRLPOOL 87a4730539bba7dfb1f2a50ecccf0f7216325687f34cfd5d020e618041aa027fa4c3f224fb2fdb82f67c1c020c97795312c5e52d5dca23316977823c3f227c22
+MISC metadata.xml 754 SHA256 83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141 SHA512 187c4d66d4437c68a4a6dfde214f07a9d15029eb24c44602d07daa561f817b30841cad73b0cccc9037f78588dca0a9755eeee2baa62a08e76ddb1465fad445bb WHIRLPOOL 9c536160e2003cf3ab479f533b9afd350600c70ec5b5e64319844935f23a786a625ac8840364e1dfa48cdc20ac9bbed6b5586bba7752731b8e789dc7553819a1
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,13 +0,0 @@
---- 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
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-docs.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,10 +0,0 @@
---- 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)
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,28 +0,0 @@
---- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c
-+++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c
-@@ -114,7 +114,11 @@
- faacDecSetConfiguration(priv->decoder, neaac_cfg);
-
- /* open mpeg-4 file */
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+ priv->mp4.handle = MP4Read(ip_data->filename);
-+#else
- priv->mp4.handle = MP4Read(ip_data->filename, 0);
-+#endif
- if (!priv->mp4.handle) {
- d_print("MP4Read failed\n");
- goto out;
---- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
-+++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
-@@ -164,7 +164,11 @@
- faacDecSetConfiguration(priv->decoder, neaac_cfg);
-
- /* open mpeg-4 file */
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+ priv->mp4.handle = MP4Read(ip_data->filename);
-+#else
- priv->mp4.handle = MP4Read(ip_data->filename, 0);
-+#endif
- if (!priv->mp4.handle) {
- qDebug() << "MP4Read failed";
- goto out;
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-m4a.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,18 +0,0 @@
-=== modified file 'mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp'
---- plugins/soundsourcem4a/m4a/mp4-mixxx.cpp 2010-12-31 21:46:37 +0000
-+++ plugins/soundsourcem4a/m4a/mp4-mixxx.cpp 2012-04-08 18:12:25 +0000
-@@ -163,8 +163,12 @@
- // << neaac_cfg->dontUpSampleImplicitSBR;
- faacDecSetConfiguration(priv->decoder, neaac_cfg);
-
-- /* open mpeg-4 file */
-+ /* open mpeg-4 file, check for >= ver 1.9.1 */
-+ #if MP4V2_PROJECT_version_hex <= 0x00010901
- priv->mp4.handle = MP4Read(ip_data->filename, 0);
-+ #else
-+ priv->mp4.handle = MP4Read(ip_data->filename);
-+ #endif
- if (!priv->mp4.handle) {
- qDebug() << "MP4Read failed";
- goto out;
-
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,37 +0,0 @@
---- 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 = []
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,172 +0,0 @@
---- 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{
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.0-wavpack.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,42 +0,0 @@
-=== modified file 'mixxx/plugins/soundsourcewv/soundsourcewv.cpp'
---- mixxx/plugins/soundsourcewv/soundsourcewv.cpp 2011-12-18 20:40:43 +0000
-+++ mixxx/plugins/soundsourcewv/soundsourcewv.cpp 2012-03-31 19:59:55 +0000
-@@ -9,8 +9,6 @@
-
- #include "soundsourcewv.h"
-
--void format_samples(int bps, char *dst, int32_t *src, uint32_t count);
--
- namespace Mixxx {
-
- SoundSourceWV::SoundSourceWV(QString qFilename) : SoundSource(qFilename)
-@@ -91,7 +89,8 @@
- tsdone=WavpackUnpackSamples(filewvc, tempbuffer, timesamps); //fill temp buffer with timesamps*4bytes*channels
- //data is right justified, format_samples() fixes that.
-
-- format_samples(Bps, (char *) (dest + (sampsread>>1)*m_iChannels), tempbuffer, tsdone*m_iChannels); //this will unpack the 4byte/sample
-+ SoundSourceWV::format_samples(Bps, (char *) (dest + (sampsread>>1)*m_iChannels), tempbuffer, tsdone*m_iChannels);
-+ //this will unpack the 4byte/sample
- //output of wUnpackSamples(), sign-extending or truncating to output 16bit / sample.
- //specifying dest+sampsread should resume the conversion where it was left if size requested
- //required multiple reads (size req. > fixed buffer size)
-@@ -152,7 +151,7 @@
- return ERR;
- }
-
--void format_samples(int Bps, char *dst, int32_t *src, uint32_t count)
-+void SoundSourceWV::format_samples(int Bps, char *dst, int32_t *src, uint32_t count)
- {
- //this handles converting the fixed 32bit per sample produced by UnpackSamples
- //to 16 bps, by truncating (24/32) or sign-extending (8)
-
-=== modified file 'mixxx/plugins/soundsourcewv/soundsourcewv.h'
---- mixxx/plugins/soundsourcewv/soundsourcewv.h 2011-10-09 19:05:15 +0000
-+++ mixxx/plugins/soundsourcewv/soundsourcewv.h 2012-03-31 19:26:26 +0000
-@@ -37,7 +37,7 @@
- unsigned long filelength;
- WavpackContext * filewvc; //works as a file handle to access the wv file.
- int32_t tempbuffer[WV_BUF_LENGTH]; //hax ! legacy from cmus. this is 64k*4bytes.
--
-+ void format_samples(int, char *, int32_t *, uint32_t);
- };
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-cflags.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,15 +0,0 @@
-=== modified file 'mixxx/build/depends.py'
---- mixxx/build/depends.py 2011-12-23 22:09:30 +0000
-+++ mixxx/build/depends.py 2012-05-05 00:03:59 +0000
-@@ -623,10 +623,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
-
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-docs.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-docs.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,12 +0,0 @@
-=== modified file 'mixxx/src/SConscript'
---- mixxx/src/SConscript 2012-01-23 11:25:21 +0000
-+++ mixxx/src/SConscript 2012-05-05 00:05:56 +0000
-@@ -219,7 +219,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)
-
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-no-bzr.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-no-bzr.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,41 +0,0 @@
-=== modified file 'mixxx/src/SConscript'
---- mixxx/src/SConscript 2012-01-23 11:25:21 +0000
-+++ mixxx/src/SConscript 2012-05-05 00:08:40 +0000
-@@ -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 = []
-
-=== modified file 'mixxx/src/SConscript.env'
---- mixxx/src/SConscript.env 2011-12-23 23:42:23 +0000
-+++ mixxx/src/SConscript.env 2012-05-05 00:07:58 +0000
-@@ -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,
-
Deleted: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.10.9999-system-libs.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,181 +0,0 @@
-=== modified file 'mixxx/build/depends.py'
---- mixxx/build/depends.py 2011-12-23 22:09:30 +0000
-+++ mixxx/build/depends.py 2012-05-04 23:44:31 +0000
-@@ -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):
-
-=== modified file 'mixxx/build/features.py'
---- mixxx/build/features.py 2011-11-19 20:27:07 +0000
-+++ mixxx/build/features.py 2012-05-04 23:56:45 +0000
-@@ -665,25 +665,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-03-22 16:24:04 +0000
-+++ mixxx/src/engine/enginefilter.h 2012-05-04 23:57:03 +0000
-@@ -20,13 +20,13 @@
-
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.9/fidlib.h"
-+#include "fidlib.h"
- #include "defs.h"
-
--enum filterType{
-- FILTER_LOWPASS,
-- FILTER_BANDPASS,
-- FILTER_HIGHPASS
-+enum filterType{
-+ FILTER_LOWPASS,
-+ FILTER_BANDPASS,
-+ FILTER_HIGHPASS
- };
-
- #define PREDEF_HP 1
-
-=== modified file 'mixxx/src/engine/enginefilterbutterworth8.cpp'
---- mixxx/src/engine/enginefilterbutterworth8.cpp 2011-03-22 16:24:04 +0000
-+++ mixxx/src/engine/enginefilterbutterworth8.cpp 2012-05-04 23:57:29 +0000
-@@ -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);
-
Added: trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -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.9999-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -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.9999-no-bzr.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -0,0 +1,38 @@
+--- mixxx-9999/src/SConscript.env
++++ mixxx-9999/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-9999/src/SConscript
++++ mixxx-9999/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 = []
Added: 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 (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch 2012-08-11 17:06:14 UTC (rev 2197)
@@ -0,0 +1,150 @@
+=== 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 @@
+
+ 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):
+
+@@ -218,7 +203,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))
+@@ -227,42 +211,13 @@
+ (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):
+- 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])
+-
+- # Check if the compiler has SSE extention enabled
+- # Allways the case on x64 (core instructions)
+- optimize = int(util.get_flags(build.env, 'optimize', 1))
+- if self.sse_enabled(build):
+- 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-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 @@
+ 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-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
+@@ -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{
+
+--- 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 @@
+ #include "engine/enginefilterbutterworth8.h"
+ #include "engine/enginefilter.h"
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.10/fidlib.h"
+
+ /* Local Prototypes */
+ inline double _processLowpass(double *coef, double *buf, register double val);
+
Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.0.ebuild 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 mp4 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
- x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- x11-libs/qt-qt3support:4
- x11-libs/qt-svg:4
- x11-libs/qt-webkit:4
- x11-libs/qt-xmlpatterns:4
- aac? ( media-libs/faad2 )
- 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}-system-libs.patch
- epatch "${FILESDIR}"/${P}-cflags.patch
- epatch "${FILESDIR}"/${P}-docs.patch
- epatch "${FILESDIR}"/${P}-no-bzr.patch
- epatch "${FILESDIR}"/${P}-libmp4v2_r479_compat.patch
- epatch "${FILESDIR}"/${P}-wavpack.patch
-
- # patch external libsoundtouch
-# epatch "${FILESDIR}"/${P}-libsoundtouch.patch
-
- # patch bzr revisoon issue.
-# sed -i -e 's:return os.popen("bzr revno").readline().strip():return "gentoo":' \
-# src/SConscript.env || die "sed revno failed"
-
- # 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 \
- $(use_scons aac faad) \
- $(use_scons debug qdebug) \
- $(use_scons mp3 mad) \
- $(use_scons mp4 m4a) \
- $(use_scons shout shoutcast) \
- $(use_scons wavpack wv) \
- hifieq=1 \
- vinylcontrol=1 \
- tuned=1 \
- optimize=0 \
- || die
-}
-
-src_install() {
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
- LIBPATH="/usr/$(get_libdir)" escons install \
- prefix=/usr \
- install_root="${D}"/usr || die
- dodoc README Mixxx-Manual.pdf
-}
Deleted: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.10.9999.ebuild 2012-08-11 17:06:14 UTC (rev 2197)
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.0.ebuild,v 1.3 2012/05/01 16:32:12 radhermit Exp $
-
-EAPI=4
-
-inherit bzr eutils multilib scons-utils toolchain-funcs
-
-DESCRIPTION="A Qt based Digital DJ tool"
-HOMEPAGE="http://mixxx.sourceforge.net";
-EBZR_REPO_URI="lp:mixxx/1.10"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="aac debug doc mp3 mp4 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
- x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- x11-libs/qt-svg:4
- x11-libs/qt-webkit:4
- x11-libs/qt-xmlpatterns:4
- aac? (
- media-libs/faad2
- media-libs/libmp4v2
- )
- mp3? ( media-libs/libmad )
- mp4? ( media-libs/libmp4v2 )
- pulseaudio? ( media-sound/pulseaudio )
- shout? ( media-libs/libshout )
- wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-S=${S}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-system-libs.patch
- epatch "${FILESDIR}"/${P}-cflags.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_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)
-}
-
-src_install() {
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
- LIBPATH="/usr/$(get_libdir)" escons install \
- prefix=/usr \
- install_root="${D}"/usr
-
- dodoc README Mixxx-Manual.pdf
-}
Added: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild 2012-08-11 17:06:14 UTC (rev 2197)
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit bzr eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net";
+EBZR_REPO_URI="lp:mixxx/1.11"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="aac debug doc mp3 mp4 pulseaudio shout wavpack"
+
+RDEPEND="dev-libs/protobuf
+ 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
+ media-libs/vamp-plugin-sdk
+ virtual/glu
+ virtual/opengl
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ x11-libs/qt-sql:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-xmlpatterns:4
+ aac? (
+ media-libs/faad2
+ media-libs/libmp4v2:0
+ )
+ mp3? ( media-libs/libmad )
+ mp4? ( media-libs/libmp4v2 )
+ pulseaudio? ( media-sound/pulseaudio )
+ shout? ( media-libs/libshout )
+ wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+S=${S}/${PN}
+
+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_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)
+}
+
+src_install() {
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+ LIBPATH="/usr/$(get_libdir)" escons install \
+ prefix=/usr \
+ install_root="${D}"/usr
+
+ dodoc README Mixxx-Manual.pdf
+}
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-08-11 15:48:55 UTC (rev 2196)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-08-11 17:06:14 UTC (rev 2197)
@@ -29,13 +29,16 @@
media-libs/vamp-plugin-sdk
virtual/glu
virtual/opengl
- >=x11-libs/qt-gui-4.6:4
- >=x11-libs/qt-opengl-4.6:4
- >=x11-libs/qt-qt3support-4.6:4
- >=x11-libs/qt-svg-4.6:4
- >=x11-libs/qt-webkit-4.6:4
- >=x11-libs/qt-xmlpatterns-4.6:4
- aac? ( media-libs/faad2 )
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ x11-libs/qt-sql:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-xmlpatterns:4
+ aac? (
+ media-libs/faad2
+ media-libs/libmp4v2:0
+ )
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
pulseaudio? ( media-sound/pulseaudio )