reenable gst support

4 files changed, 24 insertions, 11 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 6011258bf7b3..ee046936c6ff 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.57 2004/03/20 15:27:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.58 2004/03/28 23:14:01 foser Exp $
+
+  28 Mar 2004; foser <foser@gentoo.org> control-center-2.5.4.ebuild :
+  Reenabled gstreamer
 
 *control-center-2.5.4 (20 Mar 2004)
 
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 0596302683a1..7938b168fb24 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,10 +1,11 @@
-MD5 421429ab436d57f3b3f4394215003fc3 control-center-2.5.4.ebuild 1901
+MD5 dfe3d9c41be92663ec6afbeda736a463 control-center-2.5.4.ebuild 1849
 MD5 8bcb94ccbd821b943d0061900648a69e control-center-2.4.0.ebuild 1432
 MD5 7b5319985f9fa99996bac5e08205cb26 control-center-1.4.0.5-r1.ebuild 1209
-MD5 3ff44c625d3ff90ff3c5628eae152249 ChangeLog 7678
+MD5 3d31bf62c0f781bf34659c911f19e1fd ChangeLog 7771
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 440e2fbb11ac5952e79c4205595d54f3 files/digest-control-center-2.4.0 74
 MD5 9586f48d3351e8286cd850904020e3c6 files/digest-control-center-2.5.4 74
+MD5 111edb31ce663d8dbe8011f77cf9e913 files/control-center-2.5.4-fix_gst_0.8.patch 443
 MD5 b76eaa4944f6f4be761fc68f0c46c52c files/control-center-2.4.0-64bit-fixes.patch 1663
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
 MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943
diff --git a/gnome-base/control-center/control-center-2.5.4.ebuild b/gnome-base/control-center/control-center-2.5.4.ebuild
index 04c8900b4466..74ac605ea837 100644
--- a/gnome-base/control-center/control-center-2.5.4.ebuild
+++ b/gnome-base/control-center/control-center-2.5.4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.5.4.ebuild,v 1.1 2004/03/20 15:27:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.5.4.ebuild,v 1.2 2004/03/28 23:14:01 foser Exp $
 
 # FIXME : double check all the acme stuff
-# FIXME : readd gstreamer support
 inherit gnome2 eutils
 
 DESCRIPTION="The gnome2 Desktop configuration tool"
@@ -12,7 +11,7 @@ LICENSE="GPL-2"
 
 SLOT="2"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
-IUSE="alsa"
+IUSE="alsa gstreamer"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -34,10 +33,10 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	>=x11-wm/metacity-2.4.5
 	>=x11-libs/libxklavier-0.97
 	alsa? ( >=media-libs/alsa-lib-0.9 )
+	gstreamer? ( >=media-libs/gst-plugins-0.8 )
 	!gnome-extra/fontilus
 	!gnome-extra/themus
 	!gnome-extra/acme"
-#	gstreamer? ( >=media-libs/gst-plugins-0.7.6 )
 
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.11
@@ -50,8 +49,7 @@ G2CONF="${G2CONF} \
 	--disable-schemas-install\
 	--enable-vfs-methods \
 	$(use_enable alsa) \
-	--disable-gstreamer"
-#	$(use_enable gstreamer)"
+	$(use_enable gstreamer)"
 
 USE_DESTDIR="1"
 
@@ -68,7 +66,7 @@ src_unpack() {
 	# FIXME : this broke again
 #	epatch ${FILESDIR}/${PN}-2.2-icons_install.patch
 
-#	epatch ${FILESDIR}/${P}-fix_gst_0.8.patch
-#	WANT_AUTOCONF=2.5 autoconf || die
+	epatch ${FILESDIR}/${P}-fix_gst_0.8.patch
+	WANT_AUTOCONF=2.5 autoconf || die
 
 }
diff --git a/gnome-base/control-center/files/control-center-2.5.4-fix_gst_0.8.patch b/gnome-base/control-center/files/control-center-2.5.4-fix_gst_0.8.patch
new file mode 100644
index 000000000000..f7d224d3e594
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.5.4-fix_gst_0.8.patch
@@ -0,0 +1,11 @@
+--- configure.in	2004-03-14 02:12:35.406882224 +0100
++++ configure.in.patched	2004-03-14 02:12:45.294379096 +0100
+@@ -329,7 +329,7 @@
+ 
+ if test "x$ENABLE_GSTREAMER" = "xyes"; then
+    have_gstreamer=no
+-   PKG_CHECK_MODULES(GST, gstreamer-interfaces-0.7 >= 0.7.3.1,
++   PKG_CHECK_MODULES(GST, gstreamer-interfaces-0.8 >= 0.7.3.1,
+ 		   have_gstreamer=yes,
+ 		   AC_MSG_RESULT(*** All of GStreamer dependent parts will be disabled ***))
+ else