Fix compilation with gcc-4.9 (#529962 by Martin Väth and Stephan Hartmann), fix hang during gapless transition (#520090 by Georg Rudoy), drop old

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

7 files changed, 73 insertions, 76 deletions

diff --git a/media-libs/gst-plugins-base/ChangeLog b/media-libs/gst-plugins-base/ChangeLog
index b129007131c2..0eb9f27dfd3d 100644
--- a/media-libs/gst-plugins-base/ChangeLog
+++ b/media-libs/gst-plugins-base/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/gst-plugins-base
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.259 2014/12/24 18:43:16 leio Exp $
+# 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 $
+
+  19 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gst-plugins-base-0.10.36-gcc-4.9.patch,
+  +files/gst-plugins-base-0.10.36-resync-ringbuffer.patch,
+  -gst-plugins-base-0.10.36.ebuild, gst-plugins-base-0.10.36-r1.ebuild,
+  gst-plugins-base-1.2.4-r1.ebuild:
+  Fix compilation with gcc-4.9 (#529962 by Martin Väth and Stephan Hartmann),
+  fix hang during gapless transition (#520090 by Georg Rudoy), drop old
 
 *gst-plugins-base-1.4.5 (24 Dec 2014)
 
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 882a03180c76..8484cc0220ab 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gst-plugins-base-0.10.36-gcc-4.9.patch 387 SHA256 8aa0f1044ebd8ced071135820d8891f648ea0e52cc70ed0ba7c97116270b00a5 SHA512 db107ac701928d4f9787724ecca5b1eb087b5319e116a75be7cb5aba024a32336b4e94bb45a4923f97762766e263a3bce832c138fff6d69620b346370d289a97 WHIRLPOOL 3046cd9d0509d9269b98e4b6ec7f3d7560481f6404902f0f3b1c4fc42a7a230b082778fd23ddd53d8ba98ec7bcef9f4baee545af9151e2e0291550571b90b1a0
+AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 SHA256 10624838ca31df3180bbaaf8bdfef6bd52ccaad62735a16f3332a70380e5c94a SHA512 fbc252f10f4539f0448eb6f652a945ecf522f6100cb63fb362617a8990818efb1ba4bd5f866b25d439f39e32a41fcab7ef9b176d4be0e6e5bbb6c1853aa2a688 WHIRLPOOL 9a1e68a3f58e67ae42f1727921144380f6ba910bfe9f19b802d60cb85b2e7001f6284c8363e2ab514e5692786d9de1b2b28560d2d5b4932105ad78e3cf724a0c
 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 2197 SHA256 60339a2188559713d9bc512d605cd9345157270961327b9de3876c8269832406 SHA512 5d689ff1075d6afbef2e1b417f4c9dc8dc4ba80c3f18077b46ff42c09a61ba2d9f1b94252ddf8c1affcf0b59048cde2adbb6529e9f12e5a927a10808ec337fef WHIRLPOOL 0115f026763e1996094e2afe2d4295f9c23e44755d478da9b9e089596ca2754d743dcd546b725b843d82b13e192fb3fc7aa367300148b7fde12d4b94924dd657
-EBUILD gst-plugins-base-0.10.36.ebuild 1812 SHA256 307c10544d53b763b7ed5edf4684c299fa24d28fb5a520515878f8e7dd23eca7 SHA512 2259887de2d779a850c468d30d3bb3621f490cd4832b4367d4ee50173992ee0a8ffc20f1653067a598038a5d02e9e0e8a7ce12f17d651606c61046af9fbe7f08 WHIRLPOOL e95da091cbbe5b47a2245399473b184aa10e985fd044b12f025a20a89a3734900a505f06750d85c5e9990a39d7e8002de7107f861a9892270dc505383995b27c
-EBUILD gst-plugins-base-1.2.4-r1.ebuild 3095 SHA256 11de29c2abd0092bd0b52db50d3b212970db98a4cb673b8020b2c63d12934949 SHA512 c7eb68ccdcd981944cb6a00b489bf665818e442f39c1e597a9e889b0156a7ce87370907d8047999c9c40342724a1063c7e952de171a7ffdfddd92891ae31fb6d WHIRLPOOL 019f6248d447103435caf9adcc421cbc57bbf29a323cc79ec620d11af702380c44f2a3d55bee65ff0b0e15f04f174eb0f5f8789b6fe35bf2d4ec3eece1cc7a1e
+EBUILD gst-plugins-base-0.10.36-r1.ebuild 2429 SHA256 1dcb0c5418a9e111c59c5455e30c8875a5c39afc2537e89f790ca6cedc5b4fc6 SHA512 ab10883917e408ec43302ffdf15382b6cf13bc19b6f09714e3d5afbab95ec74e7130efa67d0407e844c26027b1d980e4b52eb364b2f53fb860b1a39f490d86c3 WHIRLPOOL 6fd32415115f26ec744e23f741e34997a32d30c5d6b9b0c9b787235166b8da19c348bea29c28c5d6a8acd25d9b740bb126b413cf984fba4373ac3810eb5cbf78
+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 38043 SHA256 88dac194e24cd178255fea5fcf2169256456c561ac56efd6157cc46585a8914f SHA512 e5d96d042c25436994a3129cc5b40e016a2131f244164f8e90cab77257043be18b3790169c3f65ca5f2c610a7c95ec0bba28b5268011eb3bfd5585373425cab0 WHIRLPOOL edb53d6638125fb28747621af31eb0ce87b0662f15594c35547c5ca97f9a4a7e10f52c2ee1b6b422a2a23a44d5d3b296c25591f5a0e05288e63507709d8c3b85
+MISC ChangeLog 38458 SHA256 b4e71493412f2bca19a216c64d1fb0bdfef27e232168dc02334f88e29b1184cf SHA512 0332b3676dacf34d6ae6503983f08665961260b50b69a219cd8e0ed68abaf3322c4d1401ed7f6cd20ad1f881df177cb82fba500b4f80c87ffa5a382d68686ac1 WHIRLPOOL 7ff6a1d9311a9522bfa8015fd96002c2f9b29eca6261039db3381dc692da9201d6ddf202b34ccd39de016cac9bf65322854cc01304f379282e632583a2deb097
 MISC metadata.xml 306 SHA256 c231940bd8d010a470d48c796769352620a62f59e897d21a64413634adbad8f2 SHA512 ac899e08b183aaa8c5d8dca7cdaae9223b61475d37fa8f3201d6c70e12d00ec65e495351644ca3b0f1e4f38a6d7f5b5865c055b349e2cfd28b8e258f77645abb WHIRLPOOL e5b4eded98e18da083cbe2bb418b2efeb24c3e8a2d55c8f2c66457267fbe1b55f02f99668aa91edf16b69046beee2c99a52188d168bc389237651a6348869bff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlS851IACgkQCaWpQKGI+9QzIwCfddD4AZX1lkq0v0h2lAwf8Vbt
+ceUAn2yM0cu8hlLfXHAKzlPZjcY+/LTk
+=JRKe
+-----END PGP SIGNATURE-----
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.36-gcc-4.9.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.36-gcc-4.9.patch
new file mode 100644
index 000000000000..8ee0e7e4acbd
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.36-gcc-4.9.patch
@@ -0,0 +1,18 @@
+--- 1/gst/audioresample/resample.c
++++ 1/gst/audioresample/resample.c
+@@ -77,13 +77,13 @@
+ #define EXPORT G_GNUC_INTERNAL
+ 
+ #ifdef _USE_SSE
+-#ifndef HAVE_XMMINTRIN_H
++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
+ #undef _USE_SSE
+ #endif
+ #endif
+ 
+ #ifdef _USE_SSE2
+-#ifndef HAVE_EMMINTRIN_H
++#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H)
+ #undef _USE_SSE2
+ #endif
+ #endif
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.36-resync-ringbuffer.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.36-resync-ringbuffer.patch
new file mode 100644
index 000000000000..1aae7099659e
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.36-resync-ringbuffer.patch
@@ -0,0 +1,15 @@
+--- a/gst-libs/gst/audio/gstbaseaudiosink.c
++++ b/gst-libs/gst/audio/gstbaseaudiosink.c
+@@ -921,6 +921,12 @@
+   if (!gst_ring_buffer_acquire (sink->ringbuffer, spec))
+     goto acquire_error;
+ 
++  /* We need to resync since the ringbuffer restarted */
++  sink->priv->avg_skew = -1;
++  sink->next_sample = -1;
++  sink->priv->eos_time = -1;
++  sink->priv->discont_time = -1;
++
+   if (bsink->pad_mode == GST_ACTIVATE_PUSH) {
+     GST_DEBUG_OBJECT (sink, "activate ringbuffer");
+     gst_ring_buffer_activate (sink->ringbuffer, TRUE);
\ No newline at end of file
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 0c5af397c313..246f4a6f8c34 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,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.11 2014/10/11 12:41:40 maekke Exp $
+# $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 $
 
 EAPI="5"
 
 GST_ORG_MODULE="gst-plugins-base"
-inherit gstreamer
+inherit eutils gstreamer
 
 DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
@@ -37,6 +37,12 @@ src_prepare() {
 	# 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() {
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild
deleted file mode 100644
index ff404f0b1a19..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 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.ebuild,v 1.15 2013/02/24 17:55:12 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-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=">=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-0.9.12 )
-	orc? ( >=dev-lang/orc-0.4.11 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.3
-"
-RDEPEND="${RDEPEND}
-	!<media-libs/gst-plugins-bad-0.10.10:0.10
-"
-
-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
-}
-
-src_configure() {
-	gst-plugins10_src_configure \
-		$(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
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	default
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild
index 20b9fcdd679d..d3616473fb51 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-1.2.4-r1.ebuild,v 1.12 2014/10/11 12:40:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild,v 1.13 2015/01/19 11:15:29 pacho Exp $
 
 EAPI="5"
 
 GST_ORG_MODULE="gst-plugins-base"
-inherit gstreamer
+inherit eutils gstreamer
 
 DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
@@ -50,6 +50,9 @@ src_prepare() {
 	# though they are not actually used. This needs to be fixed upstream by
 	# replacing AC_PATH_XTRA with PKG_CONFIG calls, upstream bug #731047
 	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
 }
 
 multilib_src_configure() {