Revbump with the fix for the hang

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 91 insertions, 10 deletions

diff --git a/media-libs/gst-plugins-base/ChangeLog b/media-libs/gst-plugins-base/ChangeLog
index 0eb9f27dfd3d..c1959dc77feb 100644
--- a/media-libs/gst-plugins-base/ChangeLog
+++ b/media-libs/gst-plugins-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/gst-plugins-base
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.260 2015/01/19 11:15:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.261 2015/01/19 11:17:34 pacho Exp $
+
+*gst-plugins-base-0.10.36-r2 (19 Jan 2015)
+
+  19 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +gst-plugins-base-0.10.36-r2.ebuild, gst-plugins-base-0.10.36-r1.ebuild:
+  Revbump with the fix for the hang
 
   19 Jan 2015; Pacho Ramos <pacho@gentoo.org>
   +files/gst-plugins-base-0.10.36-gcc-4.9.patch,
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 8484cc0220ab..74a65821eabf 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -6,15 +6,16 @@ AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 SHA256 10624838ca31df31
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
 DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d
 DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383
-EBUILD gst-plugins-base-0.10.36-r1.ebuild 2429 SHA256 1dcb0c5418a9e111c59c5455e30c8875a5c39afc2537e89f790ca6cedc5b4fc6 SHA512 ab10883917e408ec43302ffdf15382b6cf13bc19b6f09714e3d5afbab95ec74e7130efa67d0407e844c26027b1d980e4b52eb364b2f53fb860b1a39f490d86c3 WHIRLPOOL 6fd32415115f26ec744e23f741e34997a32d30c5d6b9b0c9b787235166b8da19c348bea29c28c5d6a8acd25d9b740bb126b413cf984fba4373ac3810eb5cbf78
+EBUILD gst-plugins-base-0.10.36-r1.ebuild 2299 SHA256 1c83d242555ffde0914125a4025dc03cda56dfeab78676be4e9096a00ace46cd SHA512 6ffe63e863068600255bcab7e1a6dc33d0dcfac2c1bab54f51955ab3f39c67d9e5fec3144fd4960d39244e75cdfa110dae9759ad39b01b5801dcbb178159f7fa WHIRLPOOL e6e002d2388e8bf99bacd529dbe0672796aa1fc84cfc023b60d17098e623c28743e0e4506df8e1417f0648e4a576bf3c99bb12157a9b59dc7c65536dd9d1d751
+EBUILD gst-plugins-base-0.10.36-r2.ebuild 2437 SHA256 11a2f98112ab66ddd127799966d96d01220e328081adbe848aac8207a86ed34d SHA512 829bbe15cc7f762bb7aeb2b8bbd133e79e2ba2c687bcfb5547e87d1cca28741e48f5d86591fbeff399c13447e284c653a630700b0ecf1d1ebd482b3407d98f69 WHIRLPOOL d8f87a069b7ee191cf9f11bba9d22542ac73760b1d270e6e0cf42eb15b31201dd6fa73f02c2246cf0edac76ba31e2d3f7df56186fc85c49045b55ed1f8557b6d
 EBUILD gst-plugins-base-1.2.4-r1.ebuild 3197 SHA256 7fbb24e428c54969acbd5f0f605833c1daea909af7aeae17221da0cd91c68e11 SHA512 38370643f96fe7b1f09966360b83831273703fdc9043d1d726e0c5e0b16050617b3f0e81bea5b27dde8246e90cb7ef77c57af15f0f89a42e412d0604a32515ea WHIRLPOOL b9f198f10f192b51af5c25248f29482bcc0a95e49b3340c0d930080d31886ad81969f8c59bd5e359a90f54674a95a7c5728278e3d83bb9a11003f731d464ee39
 EBUILD gst-plugins-base-1.4.5.ebuild 3098 SHA256 f705711b2f3632f5d48a861e544e734cc5f34afb0e21fadfe6485c3cb44407f0 SHA512 ffd7a27c077f76ca346d0cfbb499cb6f851251604890cd543a8dd9d4bb52b3850ef429995f6f932c32ea63717cf86db56dc163b3c6d99f17d34db1847470a1e2 WHIRLPOOL 16e91ce7dc62799a90072d1ba69e1480db25e5172bced5bfdb7175989149292357bafdb430e1b85853de7aacb98886abdbbf725cfaeb99b53fd9d406dc6186b5
-MISC ChangeLog 38458 SHA256 b4e71493412f2bca19a216c64d1fb0bdfef27e232168dc02334f88e29b1184cf SHA512 0332b3676dacf34d6ae6503983f08665961260b50b69a219cd8e0ed68abaf3322c4d1401ed7f6cd20ad1f881df177cb82fba500b4f80c87ffa5a382d68686ac1 WHIRLPOOL 7ff6a1d9311a9522bfa8015fd96002c2f9b29eca6261039db3381dc692da9201d6ddf202b34ccd39de016cac9bf65322854cc01304f379282e632583a2deb097
+MISC ChangeLog 38660 SHA256 c6f7057c43d86119d502aaafc3404f4a58e6045664f80cad645174fde742884e SHA512 cd7d82b1b1033be40f38ae051a7f244b6774a7a4267aace3f394ae86a129871a6f8c5a08aac3986e86ed540985dcf063f2a45f04db87e60dfcc6b9a411fcccdd WHIRLPOOL 38e3b54ef3684b410e5124cf02fe99225631fa73c1f83e7c255dd6f81a8f8c0dd98afe0dc586db9c42ae4b477e7da1cdadca14583a5b9c61f46da112496357f8
 MISC metadata.xml 306 SHA256 c231940bd8d010a470d48c796769352620a62f59e897d21a64413634adbad8f2 SHA512 ac899e08b183aaa8c5d8dca7cdaae9223b61475d37fa8f3201d6c70e12d00ec65e495351644ca3b0f1e4f38a6d7f5b5865c055b349e2cfd28b8e258f77645abb WHIRLPOOL e5b4eded98e18da083cbe2bb418b2efeb24c3e8a2d55c8f2c66457267fbe1b55f02f99668aa91edf16b69046beee2c99a52188d168bc389237651a6348869bff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS851IACgkQCaWpQKGI+9QzIwCfddD4AZX1lkq0v0h2lAwf8Vbt
-ceUAn2yM0cu8hlLfXHAKzlPZjcY+/LTk
-=JRKe
+iEYEAREIAAYFAlS8588ACgkQCaWpQKGI+9SQBgCfZbsKAG24Ma6oU51q0Ux6P7so
+Vn0AnAoqc9PNvUL98XHkaZ7WUYiDmEiI
+=Scxc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild
index 246f4a6f8c34..66e022fca463 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild,v 1.12 2015/01/19 11:15:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild,v 1.13 2015/01/19 11:17:34 pacho Exp $
 
 EAPI="5"
 
@@ -40,9 +40,6 @@ src_prepare() {
 
 	# Fix compilation with gcc-4.9, bug #529962
 	epatch "${FILESDIR}"/${PN}-0.10.36-gcc-4.9.patch
-
-	# baseaudiosink: Resync when ringbuffer resets (from '0.10' branch)
-	epatch "${FILESDIR}"/${PN}-0.10.36-resync-ringbuffer.patch
 }
 
 multilib_src_configure() {
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
new file mode 100644
index 000000000000..dccafad3f7a1
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild,v 1.1 2015/01/19 11:17:34 pacho Exp $
+
+EAPI="5"
+
+GST_ORG_MODULE="gst-plugins-base"
+inherit eutils gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+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="+introspection nls +orc"
+
+RDEPEND=">=media-libs/gstreamer-${PV}:0.10[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	app-text/iso-codes
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.3
+"
+RDEPEND="${RDEPEND}
+	!<media-libs/gst-plugins-bad-0.10.10:0.10
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-medialibs-20140508-r5
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+	)
+"
+
+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 || die
+
+	# Fix compilation with gcc-4.9, bug #529962
+	epatch "${FILESDIR}"/${PN}-0.10.36-gcc-4.9.patch
+
+	# baseaudiosink: Resync when ringbuffer resets (from '0.10' branch)
+	epatch "${FILESDIR}"/${PN}-0.10.36-resync-ringbuffer.patch
+}
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable orc) \
+		--disable-examples \
+		--disable-debug \
+		--disable-static
+
+	# 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
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}