diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2004-03-28 23:14:01 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2004-03-28 23:14:01 +0000 |
| commit | 201946bb74faae813130df3942dccffa1bf2c8d4 (patch) | |
| tree | f99648a868cf74de579480b5b87b9efb2670c02c /gnome-base | |
| parent | Fix for bug #45143 (Manifest recommit) (diff) | |
| download | gentoo-2-201946bb74faae813130df3942dccffa1bf2c8d4.tar.gz gentoo-2-201946bb74faae813130df3942dccffa1bf2c8d4.tar.bz2 gentoo-2-201946bb74faae813130df3942dccffa1bf2c8d4.zip | |
reenable gst support
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/control-center/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-base/control-center/control-center-2.5.4.ebuild | 14 | ||||
| -rw-r--r-- | gnome-base/control-center/files/control-center-2.5.4-fix_gst_0.8.patch | 11 |
3 files changed, 21 insertions, 9 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/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 |