media-sound/mixxx: Added support for AAC and WavPack audio codecs.

svn path=/sunrise/; revision=12524

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 5d271bc88deeb029052edbdec64dc45e0cf1916b..d11fc9e9ac931d604d146eb3687a45c4570018e6 100644 (file)
--- 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: $
 
+  21 Nov 2011; Alex Barker (KWhat) <alex@1stleg.com> mixxx-1.9.2.ebuild,
+  mixxx-9999.ebuild:
+  Added support for AAC and WavPack audio codecs.
+
   09 Nov 2011; Alex Barker (KWhat) <alex@1stleg.com> mixxx-9999.ebuild,
   files/mixxx-9999-libsoundtouch.patch:
   Live ebuild update to depend on qt 4.6 or later and fixed the libsoundtouch

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index ce01f2cd2da5db1c0f012cc949626b1855b78c80..779450822fa4c6b90abf4731454fcd17e1fd0dd8 100644 (file)
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -3,7 +3,7 @@ AUX mixxx-1.9.2-libsoundtouch.patch 3342 RMD160 a85ff591389c9fa6b25de55f3cda7e8e
 AUX mixxx-9999-flags.patch 624 RMD160 b10c1e796fd71c35c24781cfbdbb33f7955cc4ac SHA1 f9d8e2eb698b90a50b2c110902b94ddb6300b847 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5
 AUX mixxx-9999-libsoundtouch.patch 2233 RMD160 e64e4ebe0241d3be2a691ed819b0beb7bd7db5f1 SHA1 3560630ab5bd9716fc54a104edadd15478ff2a27 SHA256 35abe2708d701a7cfaade4b33e76657a11bb620f73d484126d53c5ae95424759
 DIST mixxx-1.9.2-src.tar.gz 7444069 RMD160 4062fb626f5ce49c2081b57641fb6bc7ba52a540 SHA1 41cc27b5fd7a7b2e999ba337114f5e6b4fa9d7be SHA256 2cefee1f5cf91344f12df5c1e9320e30d5ad29361a0bc590e6f5b9d2e969af77
-EBUILD mixxx-1.9.2.ebuild 1770 RMD160 ce05bfc60f3df3613fbae72425c7ad060c53bacf SHA1 413c29c549b7fdacd36ebcc5dd0e7e961a04f87c SHA256 9f8cd3b6ed81d2501dc11c05057d9ddfdb4f0d0ff8c17beae45686119c3cb775
-EBUILD mixxx-9999.ebuild 1768 RMD160 c4885620611a722dff19e101e78326c4a121ffc4 SHA1 6bd00841dc6555401bca5529bdc64b95ff808635 SHA256 d9541f2141f8883e267e7f9c51651ded29151c3eabe3f298b07a1373b48ca7cd
-MISC ChangeLog 2388 RMD160 f572d8c92cdd2d985672b6eb128f0e0beb0195ba SHA1 ca2dbb2b3eebe466452150ebb728589e27b315fb SHA256 9f19e891e8b89815b1ad99891ed78651c28b9369f647ca411a89d6c932c0311c
+EBUILD mixxx-1.9.2.ebuild 1897 RMD160 1f911eb96b344f80dad37ec46cc5f1464dfa8801 SHA1 67352b78ed803c63d8bd0f364ac5229aafee73c9 SHA256 4f4c190326e47e7a3beb0847a272c12065bcf2196975b53623a54eb6976e00ff
+EBUILD mixxx-9999.ebuild 1895 RMD160 92bd160304f0ee22b8ebb3f15fb7b232faa4b768 SHA1 e4a14e4a2b59aa52ccf7586822ab3bb92b9cd1cd SHA256 560aa639e69ce4ae151a24fcac9298e80e0d62a5bbc1ef3af152fe34ad7f648f
+MISC ChangeLog 2533 RMD160 b86204105cb0b7b8a8573f0480e46da1b35b72e2 SHA1 cded9c91c90235792f1c987f1375f7a7c7334946 SHA256 b7118a24230c8bdec7969ce1c688661b3de91d0ee9799e9733088151c9b9366b
 MISC metadata.xml 410 RMD160 8b5dee500da763730f1ffd02863d23221cb4f04b SHA1 e09418482c729b27b392f42ecf3e4344f71c56b9 SHA256 812fc2fb4d75f2035068cd2f547174c6aedf91799a1fc64ef54d15c611a28128

diff --git a/media-sound/mixxx/mixxx-1.9.2.ebuild b/media-sound/mixxx/mixxx-1.9.2.ebuild
index 311ed6e575b0aac66b7194ed9a7dfa37107c6808..9947b11c1e2f4f25c2079d490eeacd1f969bbed9 100644 (file)
--- a/media-sound/mixxx/mixxx-1.9.2.ebuild
+++ b/media-sound/mixxx/mixxx-1.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug mp4 pulseaudio shout"
+IUSE="aac debug mp4 pulseaudio shout wavpack"
 
 RDEPEND="media-libs/flac
        media-libs/libid3tag
@@ -33,11 +33,13 @@ RDEPEND="media-libs/flac
        x11-libs/qt-qt3support:4
        x11-libs/qt-webkit:4
        x11-libs/qt-xmlpatterns:4
+       aac? ( media-libs/faad2 )
        mp4? (  media-libs/faad2
                media-libs/libmp4v2
        )
        pulseaudio? ( media-sound/pulseaudio )
-       shout? ( media-libs/libshout )"
+       shout? ( media-libs/libshout )
+       wavpack? ( media-sound/wavpack )"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
@@ -59,9 +61,11 @@ src_compile() {
        LIBPATH="/usr/$(get_libdir)" escons \
                prefix=/usr \
                qtdir=/usr/$(get_libdir)/qt4 \
+               $(use_scons aac faad) \
                $(use_scons debug qdebug) \
                $(use_scons mp4 m4a) \
                $(use_scons shout shoutcast) \
+               $(use_scons wavpack wv) \
                hifieq=1 \
                vinylcontrol=1 \
                optimize=0 \

diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 7fc697e15a7aaf40e01c198c6c940d0c60a44799..c547b5296d1105fe1cb912701e0ace71c5f42a0b 100644 (file)
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -12,7 +12,7 @@ EBZR_REPO_URI="lp:mixxx"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug mp4 pulseaudio shout"
+IUSE="aac debug mp4 pulseaudio shout wavpack"
 
 RDEPEND="media-libs/flac
        media-libs/libid3tag
@@ -32,11 +32,13 @@ RDEPEND="media-libs/flac
        >=x11-libs/qt-qt3support-4.6:4
        >=x11-libs/qt-webkit-4.6:4
        >=x11-libs/qt-xmlpatterns-4.6:4
+       aac? ( media-libs/faad2 )
        mp4? (  media-libs/faad2
                media-libs/libmp4v2
        )
        pulseaudio? ( media-sound/pulseaudio )
-       shout? ( media-libs/libshout )"
+       shout? ( media-libs/libshout )
+       wavpack? ( media-sound/wavpack )"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
@@ -60,9 +62,11 @@ src_compile() {
        LIBPATH="/usr/$(get_libdir)" escons \
                prefix=/usr \
                qtdir=/usr/$(get_libdir)/qt4 \
+               $(use_scons aac faad) \
                $(use_scons debug qdebug) \
                $(use_scons mp4 m4a) \
                $(use_scons shout shoutcast) \
+               $(use_scons wavpack wv) \
                hifieq=1 \
                vinylcontrol=1 \
                optimize=0 \