Version bump with some bugfixes.

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

3 files changed, 43 insertions, 3 deletions

diff --git a/media-plugins/gst-plugins-x/ChangeLog b/media-plugins/gst-plugins-x/ChangeLog
index ae82329b1561..a7768c9920cf 100644
--- a/media-plugins/gst-plugins-x/ChangeLog
+++ b/media-plugins/gst-plugins-x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-x
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.126 2012/10/19 13:25:39 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.127 2012/10/21 08:02:19 tetromino Exp $
+
+*gst-plugins-x-0.10.36 (21 Oct 2012)
+
+  21 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gst-plugins-x-0.10.35.ebuild, +gst-plugins-x-0.10.36.ebuild:
+  Version bump with some bugfixes.
 
 *gst-plugins-x-0.10.35-r1 (19 Oct 2012)
 
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild
index 2d34d1f022aa..de40bd9a75b3 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild,v 1.8 2012/05/12 18:10:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild,v 1.9 2012/10/21 08:02:19 tetromino Exp $
 
 inherit gst-plugins-base
 
@@ -8,7 +8,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x8
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
+	x11-libs/libXext
+
+	x11-libs/libSM
+	x11-libs/libICE"
+# libSM and libICE are not used, but the build system links to them anyway
+# Fixed in >=0.10.35-r1
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
new file mode 100644
index 000000000000..5df07081202b
--- /dev/null
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild,v 1.1 2012/10/21 08:02:19 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+# xshm is a compile time option of ximage, which is in libXext
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
+
+src_prepare() {
+	gst-plugins-base_src_prepare
+
+	# 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
+}