Not compatible with libav >= 10 , drop old

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

5 files changed, 23 insertions, 183 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index 8e620aac4f1d..26d191ffd6ac 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.190 2015/02/07 20:15:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.191 2015/02/11 14:45:46 pacho Exp $
+
+  11 Feb 2015; Pacho Ramos <pacho@gentoo.org>
+  -gst-plugins-ffmpeg-0.10.13_p201211-r1.ebuild,
+  -gst-plugins-ffmpeg-0.10.13_p201211.ebuild,
+  gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild:
+  Not compatible with libav >= 10 , drop old
 
 *gst-plugins-ffmpeg-0.10.13_p201211-r3 (07 Feb 2015)
 
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 5c717fb574dd..006517f36357 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -9,28 +9,14 @@ AUX 0.10.13_p201211-iscodec.patch 857 SHA256 36e5a9ecce08ce92c99bb6fca8e1989de53
 AUX 0.10.13_p201211-planaraudio.patch 6359 SHA256 99767dfcf8fd00576a6141bab6c45a59c1ac8a310362b64526209ee952c02beb SHA512 38f6d1e5c9e5866d52345e9d775813b182dec4b8632879fd22583636ce025de88d64aa5a6ffbd97926d5de40344f503b0e3f427ff139e3eaf55cc6bc2f0e58d5 WHIRLPOOL b29e68d12f9ef3fc82603a288742fc0ea19079884d44c3795745d8d00220769f3f014e11589a7b189a81b2c244cf18aabc7b1087e2aadded04f71eb6be26611c
 DIST gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz 14076 SHA256 5afa627ccbbedc1c80bfd419cb497c746aea0f27e0165a49c41947eba31774ee SHA512 cd12490600c0e56a85ec7436ec6152be8962c0e949ee9925ad64c114c60d7a72958f7c5ac98a3bdc6988bce707a2c40060e3a20b899ef2a95a30b4166bfb8145 WHIRLPOOL a7f17fd32112ba9df89ef80717946a50cc81e02e608c7cc15066987cd0e3556a1971ef5360ac50089d7c883aae5eb9d36ed3d7834fb7a075a816ceb16fa2b960
 DIST gst-ffmpeg-0.10.13_p201211.tar.xz 4285300 SHA256 cc15841b9972d1b60c9aaa3ffae14f3dbf44c0b08c14bb9319fb8956c89864c6 SHA512 9067aa92ef7613b08a51957d35d1de80897c28cb959522d9b523de6f482635dac3fe421015febb88ece624b7baee0216dd4b72e770bf92c05d8994f186d2f396 WHIRLPOOL 88ba2ce647ca821ef8f7aa22d64cf39397e30d8f34eadec475e6b627472c4baf6c7de6c60d4ca86527a67c710193dc00eb6534fe8bc92f73cc26db1f8e404a49
-EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r1.ebuild 2274 SHA256 f8ba5f06837876427fae62404f5473eaf3d730959b8ade586ba27c0055aa1932 SHA512 6e7580622fc149b27fe4ec9b7c8614e90fd4a660338f8e5a32bb5aafc83bf73ca82b4cbf3112877a8fb721cca023780f3e0ace63814dd946dd36088f2fa82424 WHIRLPOOL 73ebcbb82f613f5bd0ae9414ad4eae5712444eca806b9fc50d30f9aee7c28cb9851127eaa9e9fb237802807f034534dc0d5dcb4283c6417cf2f88279b2a36374
 EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild 2619 SHA256 920b91dbfa6b7cdf22430022d807e0b4975a9d7dcf95aa9e7783ec87d5f909f9 SHA512 41b032d6478ef6b5e238ead218ee8e5cfeb6532c4c55d0b2b65447b79288d0dbe299db8c6b6dd4160783114dccc8696be20230453c340df0f25f73a69cba4aa5 WHIRLPOOL 6f077c7c4ed65ec863f0f90d479970da3ed9c37d4a782c8d410e71231f5d083e5449ef9d58b7511bafe7a7ee9231992e46f8e054efe2cf7189be7536f57190c2
-EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild 2636 SHA256 e10f4a892e1d782cd057dc93c0b99963c32ba7e7dce61fec6cd8cf8b1fc33596 SHA512 60f3195f7ea4e31cada68c72c27d76a55e8cbc955dd467107a86e48565a501af7a0dd581b5b4fbcc4b5dc568421f458786218ce3823233d4c4d31059df350f99 WHIRLPOOL cc5f56bbef03d339b81e9a1657f10cd6bc35ad5316e3e8df7b1c5f55ab6ce47c2494a863b14d23f0a27c3fae91e5a2906ba6eec8b08975cb8c3a492a85bed61b
-EBUILD gst-plugins-ffmpeg-0.10.13_p201211.ebuild 2099 SHA256 7affaa22af3bd6e33f43eb5be31c7e10173f797415ae9600b849a21a0f31e314 SHA512 11ca18700bef6e09af5554e89e8be07bf3e05539f4ab3b1128a727078ab4349999f4166f715683e3f4fbf1f22ba7d9fe645fb48e774cd015f9bc9c129f7d63fb WHIRLPOOL 8d98d5e20138daa6d5bfd379ceffcdc455498c62854ab5e5fd8e0fd811172528553efcdcb04be7cc1bd3abd6b598ededfb8c40a9179752ade5fce771f628fd9a
-MISC ChangeLog 29394 SHA256 92a0b44f0ec22fd18e56a962209acb21b54f04251755c25030a42e21c3c44641 SHA512 e371cdde39cebcbe521bb182ca0f9c151b23624b78c697f0001efe0038bcdc270e9b64ad60d3cfcc3ae334a098fcd41e0e5bd9a1a3a6607616a63544a7c194cd WHIRLPOOL cb49959f096e26f9637589179bd6666273448f1f6645c9ce666552796fe49be05c88e4efa8d736d52d5c99c02253d156b81b5ef603aa8b4d1fc5afee13f8efbc
+EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild 2448 SHA256 68a2febfcd562aa25a77d8079a353c9d254e25d4e5ec1ac62d69be8586814b18 SHA512 9868db5d959462859a7585095bd7f6b4eac5305a1fa2c4875d2232d6d38907b3286bdc904bb13fa744e3d60dca802b10b337264d4b8b0ea8125001ab06bd1e4d WHIRLPOOL 083620991043718dc1d957c3d0fb1085b4d13e6fc5016e8ae2334c400d988a97b50d92750bbb5c080db1b79f92fecf2b8f46f25d3e95bb057dc9be27c2c26242
+MISC ChangeLog 29628 SHA256 c486cd13bba75b604b681b0e2a12a23879fb2536aef913985c56f21a9b700c00 SHA512 54771886ba0b17b43692b50318529ae66fc6b156a937d64d1207da85a9090c5790aad6de86ca48a12d23034699679fb8ba8519f1cd8195100bc46db6d466b8fd WHIRLPOOL aeda59854e4ee84d80cfd3898bd2184073bfd13673c597bc7a78d138601580f3f8a42e3d4618b84724fc9cc88f907dacbde8bc5cbcc6b0aae0ed329cee4ec54f
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU1nJfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObfgQAILNMioFs7NH+5mFKqmIEldn
-UVPIIN5GIQwwBD5hMhmMwNbOxxbceFG9conM2qFW7Y8DHJTMcCFAa5vuEulNw0Vj
-fQLzad2cr5VoitHDStfyfo+/pujOVUte5HiG6GppiizbBlGcs4lfR/jWSDG/EDoL
-TbOs9izv50j4H7e1iSQCAWVwM276JqcIGzaECvEfPcpZFEF+P0oWPjP5zZK/C2JN
-pU01qsN209fGqhvJ7QvZ9cW5sgV115waDCKlwiEXbARlO0Rn81/SNYpD6NyQD/Rc
-A2QPFB9gEIx8W6zUfpFPt3DItvNHMUlLoaZYm2foVRVAs7bCmdsqglcG0CbOO+XQ
-UvICUm7HbseWlulYIpiLF8mebAA4xD1emS1sKf+RaeVod+IsACC3mye1qzUovtDS
-FhA8j2Rum053phxCSxoANXhIMUIyYJuKxpgxHBJMu8Jy2nEOWnPZQfngYKYbvaCF
-eSTsotY5QXGxNgJv9ACqK4JI/pV8QhgpW4Cb0+bR7yfL7D1GZZFGbf6dW/TIitkt
-txpVJg33FtWNO+L0H0bwZ5flrVorq4GdgxEFUKxkmB1wSqgsMUpWuHFmPzcYhtEe
-vL0YgJsnroNZwp5kJNHRiQpgqz/rFj8+VWPPEuQpaCRf/LQMGpPOZA3/+UGBnn89
-9j0sAsnzRu+nnoVDpFoY
-=Ije1
+iEYEAREIAAYFAlTbaxwACgkQCaWpQKGI+9QOiwCfRpca9Yq9MS7VLwZRVP7PU5CO
+K2gAmQEnwRJr/WIxjjJDhKPiomMYB+5f
+=rzPF
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r1.ebuild
deleted file mode 100644
index 92a05f157643..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r1.ebuild,v 1.11 2013/10/22 07:20:44 ago Exp $
-
-EAPI=5
-
-inherit base eutils flag-o-matic
-
-MY_PN="gst-ffmpeg"
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=media-libs/gstreamer-0.10.31:0.10
-	>=media-libs/gst-plugins-base-0.10.31:0.10
-	>=virtual/ffmpeg-0.10
-	|| ( media-video/ffmpeg:0 media-libs/libpostproc )
-	orc? ( >=dev-lang/orc-0.4.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e 's/sleep 15//' -i configure.ac configure || die
-
-	# libav-9 support backported from gst-plugins-libav-1.1.0
-	epatch ../${MY_P}-libav-9-patches/*.patch
-
-	# compat bits for older ffmpeg/libav releases
-	epatch "${FILESDIR}/${PV}-channel_layout.patch" \
-		"${FILESDIR}/${PV}-iscodec.patch" \
-		"${FILESDIR}/${PV}-coma.patch" \
-		"${FILESDIR}/${PV}-gstffmpegpipe_redef.patch"
-
-	# compatibility with recent releases
-	if has_version '>=media-video/ffmpeg-1.1' || has_version '>=media-video/libav-9' ; then
-		epatch "${FILESDIR}/${PV}-planaraudio.patch"
-		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
-			   -e 's/ CodecID/ AVCodecID/g' \
-			   ext/ffmpeg/*.{c,h}
-		epatch "${FILESDIR}/${PV}-ffmpeg2.patch"
-	fi
-}
-
-src_configure() {
-	# always use system ffmpeg if possible
-	econf \
-		--with-system-ffmpeg \
-		$(use_enable orc)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if has_version "media-video/ffmpeg"; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild
index 9a3d49daa005..5db74d33652a 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.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-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild,v 1.1 2015/02/07 20:15:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild,v 1.2 2015/02/11 14:45:46 pacho Exp $
 
 EAPI=5
 
@@ -25,19 +25,21 @@ IUSE="libav +orc"
 
 S=${WORKDIR}/${MY_P}
 
-RDEPEND=">=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
 
 	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
-	libav? ( >=media-video/libav-9.12:0=[${MULTILIB_USEDEP}]
+	libav? (
+		>=media-video/libav-9.12:0=[${MULTILIB_USEDEP}]
+		<media-video/libav-10:0=[${MULTILIB_USEDEP}]
 		>=media-libs/libpostproc-10.20140517-r1:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )"
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
+"
 DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-RDEPEND="${RDEPEND}
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)]
-	)"
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
 
 src_prepare() {
 	sed -e 's/sleep 15//' -i configure.ac configure || die
@@ -73,11 +75,3 @@ multilib_src_install_all() {
 	einstalldocs
 	prune_libtool_files --modules
 }
-
-pkg_postinst() {
-	if ! use libav; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild
deleted file mode 100644
index 875094a215e3..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild,v 1.15 2013/08/11 21:48:04 aballier Exp $
-
-EAPI=5
-
-inherit base eutils flag-o-matic
-
-MY_PN="gst-ffmpeg"
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=media-libs/gstreamer-0.10.31:0.10
-	>=media-libs/gst-plugins-base-0.10.31:0.10
-	>=virtual/ffmpeg-0.10
-	|| ( media-video/ffmpeg:0 media-libs/libpostproc )
-	orc? ( >=dev-lang/orc-0.4.6 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e 's/sleep 15//' -i configure.ac configure || die
-
-	# libav-9 support backported from gst-plugins-libav-1.1.0
-	epatch ../${MY_P}-libav-9-patches/*.patch
-
-	# monkey's audio requires planar audio support to be backported
-	sed -e 's#[ \t]elements/ffdemux_ape[^ ]*##' -i tests/check/Makefile.{am,in} || die
-
-	# compat bits for older ffmpeg/libav releases
-	epatch "${FILESDIR}/${PV}-channel_layout.patch" \
-		"${FILESDIR}/${PV}-iscodec.patch" \
-		"${FILESDIR}/${PV}-coma.patch" \
-		"${FILESDIR}/${PV}-gstffmpegpipe_redef.patch"
-}
-
-src_configure() {
-	# always use system ffmpeg if possible
-	econf \
-		--with-system-ffmpeg \
-		$(use_enable orc)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if has_version "media-video/ffmpeg"; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}