[gentoo-commits] proj/gnome:master commit in: media-libs/gst-plugins-base/

[Gilles Dartiguelongue]

commit:     5cc3d8d4b36678b2268c99983e8f3f7db5ad3b58
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 14:25:28 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 15:14:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5cc3d8d4

media-libs/gst-plugins-base: copy from gentoo-x86

Compare 0.10 series with 1.0 and update both as needed.

---
 ....0.3.ebuild => gst-plugins-base-0.10.36.ebuild} |   64 +++++++-------------
 .../gst-plugins-base/gst-plugins-base-1.0.3.ebuild |   27 ++++----
 2 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.0.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild
similarity index 59%
copy from media-libs/gst-plugins-base/gst-plugins-base-1.0.3.ebuild
copy to media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild
index 74c531a..d261305 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.0.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild
@@ -11,50 +11,29 @@ HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa +introspection nls +ogg +orc +pango theora +vorbis X"
-REQUIRED_USE="theora? ( ogg ) vorbis? ( ogg )"
+IUSE="+introspection nls +orc"
 
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+RDEPEND=">=dev-libs/glib-2.24:2
+	>=media-libs/gstreamer-${PV}:0.10[introspection?]
 	dev-libs/libxml2:2
 	sys-libs/zlib
 	app-text/iso-codes
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-	ogg? ( >=media-libs/libogg-1.0 )
-	orc? ( >=dev-lang/orc-0.4.16 )
-	pango? ( >=x11-libs/pango-1.22 )
-	theora? ( >=media-libs/libtheora-1.1[encode] )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv )"
-
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	orc? ( >=dev-lang/orc-0.4.11 )
+"
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.17 )
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-		x11-proto/xproto )"
+	>=dev-util/gtk-doc-am-1.3
+	nls? ( >=sys-devel/gettext-0.11.5 )
+"
+RDEPEND="${RDEPEND}
+	!<media-libs/gst-plugins-bad-0.10.10:0.10
+"
 
 src_prepare() {
-	DOCS="AUTHORS NEWS README RELEASE"
-
 	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
 	# though they are not actually used. This needs to be fixed upstream by
 	# replacing AC_PATH_XTRA with PKG_CONFIG calls.
 	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure || die
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
 }
 
 src_configure() {
@@ -65,19 +44,17 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_enable nls) \
 		$(use_enable orc) \
-		$(use_enable alsa) \
-		$(use_enable ogg) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
 		--disable-examples \
-		--disable-freetypetest \
 		--disable-debug \
 		--disable-static
-	# cdparanoia and libvisual are split out, per leio's request
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
 }
 
 src_compile() {
@@ -85,6 +62,7 @@ src_compile() {
 }
 
 src_install() {
+	DOCS="AUTHORS NEWS README RELEASE"
 	default
 	prune_libtool_files --modules
 }

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.0.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.0.3.ebuild
index 74c531a..1f6f79e 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.0.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.0.3.ebuild
@@ -29,32 +29,22 @@ RDEPEND=">=dev-libs/glib-2.32:2
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/libXv )"
-
+		x11-libs/libXv )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
-	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.17 )
 	X? (
 		x11-proto/videoproto
 		x11-proto/xextproto
-		x11-proto/xproto )"
+		x11-proto/xproto )
+"
 
 src_prepare() {
-	DOCS="AUTHORS NEWS README RELEASE"
-
 	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
 	# though they are not actually used. This needs to be fixed upstream by
 	# replacing AC_PATH_XTRA with PKG_CONFIG calls.
 	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure || die
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
 }
 
 src_configure() {
@@ -78,6 +68,14 @@ src_configure() {
 		--disable-debug \
 		--disable-static
 	# cdparanoia and libvisual are split out, per leio's request
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
 }
 
 src_compile() {
@@ -85,6 +83,7 @@ src_compile() {
 }
 
 src_install() {
+	DOCS="AUTHORS NEWS README RELEASE"
 	default
 	prune_libtool_files --modules
 }