summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Barker (KWhat) <alex@1stleg.com>2011-09-28 21:58:28 +0000
committerAlex Barker (KWhat) <alex@1stleg.com>2011-09-28 21:58:28 +0000
commit3a41626521cc2edc34e8df17f3f26f6107f01f78 (patch)
treef2648549e6827cf494f09e3ca6d7f35fca7a05cd /media-sound
parentRevert "media-sound/mixxx: Added additional Linux 3.0 support patch from upst... (diff)
downloadsunrise-3a41626521cc2edc34e8df17f3f26f6107f01f78.tar.gz
sunrise-3a41626521cc2edc34e8df17f3f26f6107f01f78.tar.bz2
sunrise-3a41626521cc2edc34e8df17f3f26f6107f01f78.zip
media-sound/mixxx: Added additional Linux 3.0 support patch from upstream.
svn path=/sunrise/; revision=12416
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/mixxx/ChangeLog4
-rw-r--r--media-sound/mixxx/Manifest6
-rw-r--r--media-sound/mixxx/files/mixxx-1.9.0-linux3.patch12
-rw-r--r--media-sound/mixxx/mixxx-1.9.0-r2.ebuild (renamed from media-sound/mixxx/mixxx-1.9.0-r1.ebuild)0
4 files changed, 18 insertions, 4 deletions
diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 9f10f3e69..33118b2e0 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Sep 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.9.0-r1.ebuild,
+ +mixxx-1.9.0-r2.ebuild, files/mixxx-1.9.0-linux3.patch:
+ Added additional Linux 3.0 support patch from upstream.
+
29 Jun 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.9.0.ebuild,
+mixxx-1.9.0-r1.ebuild, +files/mixxx-1.9.0-linux3.patch:
Added Linux 3.0 support patch from upstream.
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 903838f7b..648df7410 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,10 +1,10 @@
AUX mixxx-1.9.0-flags.patch 1663 RMD160 b55048b592e779ea108c9772349dc2e8bbf4f276 SHA1 94a4eda09ceb1629acfb943c4be8c96a6b8ae754 SHA256 de1350b62dc266c536916f82c03d110578bb2e9bc44507a0b6c4ef28c9e8f88a
AUX mixxx-1.9.0-libsoundtouch.patch 3342 RMD160 a85ff591389c9fa6b25de55f3cda7e8e0ea6fcbe SHA1 212673d3b024934ca7c8c39591055e66b6d5016f SHA256 234e058145ca14bbbbb0f34fe1c07e5d0ff55999d952547b054744edc5feaa0d
-AUX mixxx-1.9.0-linux3.patch 486 RMD160 608d610dfc1b429219dcc717babb7a69ffb3d840 SHA1 d7d3259398b7c2d4d2c71f0474c406794ad60f66 SHA256 f4363c9271e2023379e0c6c52f162aadead9a1cb245d3206106fc1e45e6f7dc5
+AUX mixxx-1.9.0-linux3.patch 877 RMD160 bf845fea763a2d7aa98985ccf4fa83a1c4e568d0 SHA1 05552b77da25d3f5981b3cd3a3288e49a7437e03 SHA256 bff40d8de8f6d6aea254c8243fc79f9bde3ac7932fc471aa23ca049fb3614b06
AUX mixxx-9999-flags.patch 1663 RMD160 b55048b592e779ea108c9772349dc2e8bbf4f276 SHA1 94a4eda09ceb1629acfb943c4be8c96a6b8ae754 SHA256 de1350b62dc266c536916f82c03d110578bb2e9bc44507a0b6c4ef28c9e8f88a
AUX mixxx-9999-libsoundtouch.patch 3342 RMD160 ecfb3bb0b9f356a5f937a8f9162c8b23fad1da92 SHA1 7ae36d669ff1359fd457be012940c6fb1ce8c2a8 SHA256 fde2401da761e7ea808378dc6df9b49d3858f8c964ebe9a373719559b51ecb71
DIST mixxx-1.9.0-src.tar.gz 8739299 RMD160 92df03109399d984e7cf26624caf8381be407a1c SHA1 267d08884c2fce5c3c0889aaf85f70ad66105876 SHA256 95a5a9cf74bbc24b55518e81c6563afbd88c4ea2e05b35a6ec7cac69d694bf25
-EBUILD mixxx-1.9.0-r1.ebuild 1821 RMD160 9ba7f36cd4980bd72905a9819adca065aff37ef1 SHA1 93f776daada1f6f2bfb005c8adf8e17a407f4803 SHA256 efc5fcf215545926c36888535cc218ad4229c7c57e7964577d4c8e915990ab41
+EBUILD mixxx-1.9.0-r2.ebuild 1821 RMD160 9ba7f36cd4980bd72905a9819adca065aff37ef1 SHA1 93f776daada1f6f2bfb005c8adf8e17a407f4803 SHA256 efc5fcf215545926c36888535cc218ad4229c7c57e7964577d4c8e915990ab41
EBUILD mixxx-9999.ebuild 1641 RMD160 7a0568014a684e6c6767f9956e7856ba86aa8483 SHA1 f0927c3a595c62a922afd5f40165f54b2b9c9732 SHA256 4b83eacbca8179a17f2a991e019755638356151f405fd9848a6ea0d3915f0138
-MISC ChangeLog 1234 RMD160 f854a3f7b093cc1daaf96a3fb8258a0b20672bb6 SHA1 b82b08165b8d65f42ff9215a13c7e7e26b5c167a SHA256 3e3381ef92003cc2c86f494a0243130b281eb8b0fa49771f9067a72368af39e1
+MISC ChangeLog 1428 RMD160 d38eb15cf9d44f1eb4961deb36397f9f2db201f1 SHA1 e8dd78096c95562ebe2237633bee6ffbffc2e153 SHA256 77cdd285bd163a58d430d9cabc1d96c67e981ec01c293325d0a7f8718c8b9487
MISC metadata.xml 410 RMD160 8b5dee500da763730f1ffd02863d23221cb4f04b SHA1 e09418482c729b27b392f42ecf3e4344f71c56b9 SHA256 812fc2fb4d75f2035068cd2f547174c6aedf91799a1fc64ef54d15c611a28128
diff --git a/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch b/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch
index d0fc1e0b2..89bac8eaa 100644
--- a/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch
+++ b/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch
@@ -10,4 +10,14 @@
return 'linux'
if sys.platform == 'darwin':
return 'osx'
-
+--- mixxx/build/qt4.py 2011-09-15 01:05:21.872433812 +0100
++++ mixxx/build/qt4.py 2011-09-15 01:06:34.628431259 +0100
+@@ -409,7 +409,7 @@
+ self.AppendUnique(CPPFLAGS=['-DQT_GUI_LIB'])
+
+ debugSuffix = ''
+- if sys.platform == "linux2" :
++ if sys.platform in ["linux2", "linux3"]:
+ if debug : debugSuffix = '_debug'
+ for module in modules :
+ if module not in pclessModules : continue
diff --git a/media-sound/mixxx/mixxx-1.9.0-r1.ebuild b/media-sound/mixxx/mixxx-1.9.0-r2.ebuild
index df0c0a140..df0c0a140 100644
--- a/media-sound/mixxx/mixxx-1.9.0-r1.ebuild
+++ b/media-sound/mixxx/mixxx-1.9.0-r2.ebuild