Readded gstreamer support forcing the mad plugin to be installed for gstreamer suppor...

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 728b39f32b27ace53bf2797842bc719c5ac750d7..01b72611408c3652fd27d406dddfdc0fedcc762a 100644 (file)
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.32 2004/11/05 10:19:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.33 2004/11/07 10:25:18 eradicator Exp $
+
+  07 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Readded gstreamer support forcing the mad plugin to be installed for
+  gstreamer support as the ffmpeg plugin won't work (see bug #66902).
 
   05 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   amarok-1.1.1.ebuild:

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 649a55ef1bfdd1fde5c92cb3a87d985397607c87..3afa66f3dafd491b51943226a55b8a35de32c90a 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6b9032e95f57378c121ce5374ecc3f10 ChangeLog 4557
+MD5 dbc0c3bf5731663d2d1cb2dfebb39ad6 ChangeLog 4779
 MD5 6140844712d069ed2f3c3a13b94441d7 amarok-0.9.ebuild 662
-MD5 0869dab4e8fcd27b777f87dd643e1d6a amarok-1.1.1.ebuild 1354
+MD5 8c7dc2f28f55eac73b0bb98fc92f765c amarok-1.1.1.ebuild 1359
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 abbaf6509841c49f6394928d1faea57f amarok-1.0.2.ebuild 1166
 MD5 df341b2112081d185e977ecd8c3c1f3a files/digest-amarok-0.9 63
@@ -14,7 +14,7 @@ MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBi1TKArHZZzCEUG0RAkRrAJkBhf5BGIwK5uuwh31Bmk/YE/Ll2ACeK8Bk
-tdI6bXBlW8cWFLdw0vLn3/o=
-=Fdfb
+iD8DBQFBjfh6ArHZZzCEUG0RAmSwAJ9hbGSbi85Jbjg019P0oSVeSxCotgCdEcqt
+GHtDTpWxEwwyOypHGDkdrog=
+=Id3e
 -----END PGP SIGNATURE-----

diff --git a/media-sound/amarok/amarok-1.1.1.ebuild b/media-sound/amarok/amarok-1.1.1.ebuild
index 1b11067aaab1f37327f1fdebcdb5bdbc4100cc67..12be2729c55e7d9d16c0a456118f9fd99371fdb4 100644 (file)
--- a/media-sound/amarok/amarok-1.1.1.ebuild
+++ b/media-sound/amarok/amarok-1.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.4 2004/11/05 10:21:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.5 2004/11/07 10:25:18 eradicator Exp $
 
-IUSE="noamazon cjk xmms opengl xine arts"
+IUSE="noamazon cjk xmms opengl xine arts gstreamer"
 
 inherit kde eutils
 
@@ -27,11 +27,9 @@ DEPEND="=media-libs/libvisual-0.1.6
        >=dev-util/pkgconfig-0.9.0
        >=media-libs/taglib-1.3
        >=kde-base/kdelibs-3.2
-       >=x11-libs/qt-3.3"
-
-# 100% CPU usage with gst... don't use it
-#      gstreamer? ( >=media-libs/gst-plugins-0.8.1 )
-
+       >=x11-libs/qt-3.3
+       gstreamer? ( >=media-libs/gst-plugins-0.8.1 
+                    >=gst-plugins-mad-0.8.1 )"
 
 need-kde 3.2
 
@@ -49,7 +47,7 @@ src_unpack() {
 src_compile() {
        PREFIX="`kde-config --prefix`"
 
-       myconf="`use_with arts` `use_with xine` --without-gstreamer"
+       myconf="`use_with arts` `use_with xine` `use_with gstreamer`"
        myconf="${myconf} `use_with opengl` `use_enable !noamazon amazon`"
 
        kde_src_compile myconf configure make || die