| [proaudio] [2238] media-sound/mixxx apply patches thanks to Alex Barker |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2238
Author: gavlee
Date: 2012-10-01 19:41:07 +0200 (Mon, 01 Oct 2012)
Log Message:
-----------
media-sound/mixxx apply 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-9999-no-bzr.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
Modified: trunk/overlays/proaudio/media-sound/mixxx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-09-30 03:59:28 UTC (rev 2237)
+++ trunk/overlays/proaudio/media-sound/mixxx/ChangeLog 2012-10-01 17:41:07 UTC (rev 2238)
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 01 Oct 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+ files/mixxx-1.11.9999-no-bzr.patch, files/mixxx-9999-no-bzr.patch:
+ apply patches thanks to Alex Barker. small repoman payments.
+ dev-util/pkgconfig -> virtual/pkgconfig
+
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
Modified: trunk/overlays/proaudio/media-sound/mixxx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-09-30 03:59:28 UTC (rev 2237)
+++ trunk/overlays/proaudio/media-sound/mixxx/Manifest 2012-10-01 17:41:07 UTC (rev 2238)
@@ -1,12 +1,12 @@
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-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-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-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 2274 SHA256 2f0df1ddaeb9ecf35d3f1a8b834dfe455f96ff495e3a7c1eb2034feefad6a949 SHA512 94f570cdf2bb6d97ae3a4037cb50a1869c4ed700d09b70fc745307ba16b81bb8d761eb931cefa3c587fc029cd6bdd26a5c990198e80545902c3a5205d3eb1c36 WHIRLPOOL 76b0fc3787ebb682b211c27a0029ed03986dd86b9a3a886ddf5972d05df9710c20616f3f20432d69a044ea335309072beec94ac82347c139f7a1dd7b3f3ca922
-EBUILD mixxx-9999.ebuild 2269 SHA256 98bd10635d76e715ce6a2bd0cba85b7e7406521f0ef9981488056a74355a87ca SHA512 c6077d9ae6a9ad27e15cf628eb898813c1502f7aab43100ba0f2907a5f8a55ca042444989866ef77fc0d342becdee79f94438667664b259b298efbb7f5b50629 WHIRLPOOL a239d8c23cb9dcde14c1d417106e46a5eaea9af944fc04a978c77940da0b10edd6020430639ecabdbbe649f474a6960fb63f54a5223985e4f106e3b7eb59980e
-MISC ChangeLog 4898 SHA256 e810f95dbb5c413140b95e5ca875a05a814ca4eae567c583a80e3e0ae8b0bf0f SHA512 f8da6f839d24127a1938939163d8151f6a7972cc0f2e0f4d286766cf87abb5e9488f54ca96673f5db7345b9c10424dbc151f1d61d4f1bb1f03f2cd8eaa78991d WHIRLPOOL 21e75605c92bb12475fa43b80da6f83ee37d8e7c0d2b991103f9171b5d17a8130cecd87c790e63a2cda2e8f4db17064410a5f838117c3f29c0812031201ffa1c
-MISC metadata.xml 754 SHA256 83057c5b52668f9b0a507bf324a031a7714f83390bd43752b94df888a1e85141 SHA512 187c4d66d4437c68a4a6dfde214f07a9d15029eb24c44602d07daa561f817b30841cad73b0cccc9037f78588dca0a9755eeee2baa62a08e76ddb1465fad445bb WHIRLPOOL 9c536160e2003cf3ab479f533b9afd350600c70ec5b5e64319844935f23a786a625ac8840364e1dfa48cdc20ac9bbed6b5586bba7752731b8e789dc7553819a1
+EBUILD mixxx-1.11.9999.ebuild 2141 SHA256 d8deeac1d5e6987732ed7650ce2d276093d65e48ac1a6c75c965d64640c2ecf9 SHA512 f4677050ee5eca33248637c457aba675b521f819f41bcebdc917bc0d67bf5aa35ee8cff4f190d4a255202625e1d7dfe6d93e0e45bd8dd9bf07273fde132add71 WHIRLPOOL cd35634ab5abac87df09c1a07e581a20617d2a707ad8da6c810474c8584b0d57372b36a61b930efae17bc4a272ca05d39685dc3ca0348a4858462cb605eb10a8
+EBUILD mixxx-9999.ebuild 2136 SHA256 d0bdcadc5914fe165c409ee38a1ada12840825a83bf9f8ee55690c1d84ef8cfa SHA512 b3c91d3a0f9007ca7078095931e1365fbab54e5bc7a665117fe266c92cbd288dd06ae2331e2e4352ffdfb50f65b3d759519523cda1df202a284597d4bf010ac6 WHIRLPOOL 0436d995780fa21002613b23f88e552348dceea42112571076a1b0d5848e17cf97c244e4062b1828c40aabb7e28203c6d998f9506569392c8c72f2c1b504d032
+MISC ChangeLog 5138 SHA256 c27d55e7fb66cb676dd1283a55398cc1cd3456d98c6c3186860789d690f57629 SHA512 7ebcef853e7ca46eb839d1156cfb5b4692fc59768ed65a220be22e873c5839b27f291fb382feb2f14c9e79c24cafe9c63ef2a7a918b5ed9e11697d6e3fd465d2 WHIRLPOOL 60645055e62f5f5bb41b26b3dbf2951943463ee540cac89a9644acbf74637c5cddcb1ef8c0cc05b6dacfe74d099d06ede0b9dedb3f3206333e9d7d04361c1175
+MISC metadata.xml 425 SHA256 e49f5f6ac6a5dcbfb49800c089466af9d56c900a798b53c7c89e47ef6f7d3bde SHA512 5cf183c20b628ca8c2809b036cbd5bce28cf3bba582a8bf538120d5a464dbac300bcc0b23320d3786c54cf0dd273b448851b8913715c1143d22c2e37fe289483 WHIRLPOOL 0c12b3fc23b5ddd225af0f3fa43c50ce265c1ed9f84b445ccb509b64a29e247271026ea813774738599a9ff790cf500c10c9038a6cb924331dce4e1221c80f95
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 2012-09-30 03:59:28 UTC (rev 2237)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch 2012-10-01 17:41:07 UTC (rev 2238)
@@ -1,32 +1,7 @@
---- 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
+--- 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
+ from build import util, depends
mixxx_version = util.get_mixxx_version()
-branch_name = util.get_bzr_branch_name()
@@ -36,3 +11,27 @@
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']):
+
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 2012-09-30 03:59:28 UTC (rev 2237)
+++ trunk/overlays/proaudio/media-sound/mixxx/files/mixxx-9999-no-bzr.patch 2012-10-01 17:41:07 UTC (rev 2238)
@@ -1,32 +1,7 @@
---- 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
+--- 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
+ from build import util, depends
mixxx_version = util.get_mixxx_version()
-branch_name = util.get_bzr_branch_name()
@@ -36,3 +11,27 @@
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']):
+
Modified: trunk/overlays/proaudio/media-sound/mixxx/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/metadata.xml 2012-09-30 03:59:28 UTC (rev 2237)
+++ trunk/overlays/proaudio/media-sound/mixxx/metadata.xml 2012-10-01 17:41:07 UTC (rev 2238)
@@ -1,18 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>no-herd</herd>
<maintainer>
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
</maintainer>
<use>
- <flag name="djconsole">Enable djconsole support</flag>
- <flag name="hifieq">Enable hifi equalizer support</flag>
- <flag name="recording">Enable experimental recording support</flag>
<flag name="pulseaudio">Disables <pkg>media-sound/pulseaudio</pkg> support for mixxx with pasuspender</flag>
<flag name="shout">Enable shoutcast support</flag>
- <flag name="tonal">Enable tonal analysis feature</flag>
- <flag name="vinylcontrol">Enable vinylcontrol feature</flag>
</use>
</pkgmetadata>
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild 2012-09-30 03:59:28 UTC (rev 2237)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-1.11.9999.ebuild 2012-10-01 17:41:07 UTC (rev 2238)
@@ -36,8 +36,8 @@
x11-libs/qt-webkit:4
x11-libs/qt-xmlpatterns:4
aac? (
- media-libs/faad2
- media-libs/libmp4v2:0
+ media-libs/faad2
+ media-libs/libmp4v2:0
)
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
@@ -45,7 +45,7 @@
shout? ( media-libs/libshout )
wavpack? ( media-sound/wavpack )"
DEPEND="${RDEPEND}
- dev-util/pkgconfig"
+ virtual/pkgconfig"
S=${S}/${PN}
Modified: trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-09-30 03:59:28 UTC (rev 2237)
+++ trunk/overlays/proaudio/media-sound/mixxx/mixxx-9999.ebuild 2012-10-01 17:41:07 UTC (rev 2238)
@@ -36,8 +36,8 @@
x11-libs/qt-webkit:4
x11-libs/qt-xmlpatterns:4
aac? (
- media-libs/faad2
- media-libs/libmp4v2:0
+ media-libs/faad2
+ media-libs/libmp4v2:0
)
mp3? ( media-libs/libmad )
mp4? ( media-libs/libmp4v2 )
@@ -45,7 +45,7 @@
shout? ( media-libs/libshout )
wavpack? ( media-sound/wavpack )"
DEPEND="${RDEPEND}
- dev-util/pkgconfig"
+ virtual/pkgconfig"
S=${S}/${PN}