Restore 0.10.13-r1 due to bug #423717, thanks to Hanno for reminding me.

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 56 insertions, 5 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index fb59d963c92f..22bb22110b72 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.145 2012/12/02 16:12:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.146 2012/12/02 23:08:35 eva Exp $
+
+  02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  +gst-plugins-ffmpeg-0.10.13-r1.ebuild:
+  Restore 0.10.13-r1 due to bug #423717, thanks to Hanno for reminding me.
 
   02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
   gst-plugins-ffmpeg-0.10.11-r1.ebuild, gst-plugins-ffmpeg-0.10.13-r2.ebuild:
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 664354b760b5..761fd076692c 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -9,13 +9,14 @@ AUX 0.10.6/system-ffmpeg-warning.patch 3547 SHA256 fccf0f672fc34fd03d156ba4d9498
 DIST gst-ffmpeg-0.10.11.tar.bz2 4250699 SHA256 ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e
 DIST gst-ffmpeg-0.10.13.tar.bz2 4784059 SHA256 76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62 SHA512 f1141fc73b4bf1d774053ce53c4a67d5e600d6f0118ee7824cd2ff4fc8af8ba1dfbd5cf82d9e15872f3e6f8730112ddfc520a7d8df3cf605a9725e959f37e6ed WHIRLPOOL 62a018357bbb44b2cb762b7bcfb2f1a62b15b69c7a882c4a25655c0afc93e624460cc72984089dff392fc5ae852be0e6a66243c227a5ec0960d4defe8403aca7
 EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1153 SHA256 2dd65f12f7d5c6d346fc85b1feb57368933d3665a056c0563bed155c0b8835f6 SHA512 ebea81241dfea1ce1fdcbca209fc1c897d787036f0c8eb9ae5691c7c5c3a97352ec908319e59a612ee3612e65d13a9cb8bc5f6f6cce811723766fedf3b5cada2 WHIRLPOOL 1875ecff2d564f6a580af70de116a70d63f4fb76ee67d1932c261d4c1706a5e68a237808e63376a8536576b6af759e6530f5680816672cb09e8436d0d4e24c50
+EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1252 SHA256 ba3b58b3b57694f50ddcc307efd17db0cfb1e625d16b5e61a51778a1cc9e6ae0 SHA512 ff0af7a595028cfd5e60bd479be4ef80a52de190fb56a13afe2c22d6e9f2fcdfebfd8338d313697c4d0effa19dbeb907f64d0ac7e52dc6aedf1628114bcbb88a WHIRLPOOL fb173a20cbddff4891a33bb45a15be1dd49ca19bd1a2b215454952662fc4b6109e57c664952c2a49b1400a3071af3e5e5da29a3eeab453acd06724e1895088d2
 EBUILD gst-plugins-ffmpeg-0.10.13-r2.ebuild 1395 SHA256 4a2d0097a3eb9bf732423a8382f4fd27f0f2b3f5cb8ab78618a67436fd7c3953 SHA512 eed4971cb8a7d94bbf714ab0d183a273305f34874bb03a52306a1cd682e7dadebac4d7e119017d1b2e68d648b97dba7dd9b02b3b8261579b63728a0361c13468 WHIRLPOOL 309720ea24839ed9922c66fc4af7aeed3a1295863b9fcfe94c045917dc59cda79d04570c5578cf007c3e235c0e747c0d7f9c2aefd01b42b310688243cfceeb18
-MISC ChangeLog 22220 SHA256 2f08d8088d56f6ca66305d22c059d9a8c64af45cbf645b7f4fde0785d40d8b97 SHA512 91a10d4cb441857badf0da7e4d96b9403c3b3ef2cb70e193d1e6913c88f1ab391bb1ff5760633474722be0d1367a9410ddb4a2391d9b0e6a96f5533b933efd70 WHIRLPOOL 2583049e5c69b8f9abdaa7c101098221a33e633404f63c439eaae3bbd2d92be274ed7df8564e889c84555fd043ea1aef1f56abb8234aa42c2d176c4d7e008116
+MISC ChangeLog 22391 SHA256 ffe3345d953cd21a8ed7b45b1a0525539bb961b7da8fa6242074e42803618651 SHA512 654745250fd037664ebfccc68ece6885feec05af38733853b45dc14708bf8d07cc0dd81c24e25d1ff6e2310c8a4892219e997d4bdd76029045e84c61129e5467 WHIRLPOOL 3db2982064af9c9bd2e53afde1c034cc1e546319d7d7abaaffaeee44230185a5d20e5a374596bbbf50e90443890b31b8e1328bcb2ef5a1f595bdb8de1639c271
 MISC metadata.xml 261 SHA256 18c54afc2f28657fd40f56015d323fd8346d29491a58b812870831e64fbd03a2 SHA512 021cf00897b01eefc9e16e9bbd7f032a366f60449dcd2342dd0cb85086116a163cd597a35d392d7d5f1e6f95b44ddc3a16e8f77acab99dcd04293759b9576d17 WHIRLPOOL aec41c5541903ad7d5b9e7fab9fc62cb7a0831d8754bbeeb6b316bc9c56d2a8c41c349e6ad34f804ade50834001b278b71f6973f59e2de59acbbfb24f4feefee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC7fdcACgkQ1fmVwcYIWAbF0wCgx4JTsxgwyF3oMSNj5norDXxR
-cxgAoOCYz8f8WTUAZauMe8L/wCV9RCRE
-=6NGs
+iEYEAREIAAYFAlC733QACgkQ1fmVwcYIWAZ9SwCfaV3ZqKFbT59rwq68oHkGtauB
+NPIAoMDMN0WFD/HEZECtIJUCz6l38J1n
+=dHR4
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
new file mode 100644
index 000000000000..e7239139b444
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild
@@ -0,0 +1,46 @@
+# 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-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.7 2012/12/02 23:08:35 eva Exp $
+
+EAPI=4
+
+inherit base eutils flag-o-matic
+
+PD=${FILESDIR}/${PV}
+MY_PN=${PN/-plugins}
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+#SLOT=0.10
+
+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"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+orc hardened"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=media-libs/gstreamer-0.10.31
+	>=media-libs/gst-plugins-base-0.10.31
+	orc? ( >=dev-lang/orc-0.4.6 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PV}-gcc-4.7.patch )
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	if ! use hardened; then
+		econf $(use_enable orc)
+	else
+		# On hardened, we need to disable mmx and mmx2 to avoid TEXTRELs
+		econf $(use_enable orc) \
+			--with-ffmpeg-extra-configure='--disable-mmx --disable-mmx2'
+	fi
+}