media-plugins/gst-plugins-ffmpeg: Add fix for gcc-4.7: #407741, move to EAPI=4

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 70 insertions, 16 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index b241162a886c..c89cb8afb8df 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.134 2012/05/05 08:27:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.135 2012/06/15 14:58:44 jlec Exp $
+
+  15 Jun 2012; Justin Lecher <jlec@gentoo.org>
+  gst-plugins-ffmpeg-0.10.13-r1.ebuild, +files/0.10.13-gcc-4.7.patch,
+  metadata.xml:
+  Add fix for gcc-4.7: #407741, move to EAPI=4
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gst-plugins-ffmpeg-0.10.9.ebuild, gst-plugins-ffmpeg-0.10.11-r1.ebuild,
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index fc15cff9eaab..5cbaf2c28835 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX 0.10.13-gcc-4.7.patch 1982 RMD160 de0a7c8213c2fc37808465f8ba0be890c68cecf8 SHA1 cd826b0b1d9f557908dd7c007c64bd4f330837b1 SHA256 25b4072e5269e019d4a10b8ecbe77987f63be29a9424863c7ed3342103ad25fa
 AUX 0.10.5/lavc.patch 8765 RMD160 fd4d4d6c0d9cea1202f511a071a8ebf4bb7bb80c SHA1 ba3b67eee7754122ca6adc49d899ad922355bd33 SHA256 aef53bcf9fcac97662df70858ea5a2e02c4661f695b5d0425d0ca6f4a53342ad
 AUX 0.10.5/offset.patch 525 RMD160 bc69512dbd8cbf979bbcf88f07bb11ddc356ab04 SHA1 761f0c4fa50fb942b94996c52789b40558188ace SHA256 dd5ccdb6cc16d72f7dd94e89f549c32fe09a483b503369fa06e3b673d89d6d33
 AUX 0.10.5/system-ffmpeg-warning.patch 3567 RMD160 a86a0b85d1b7972898ca775218fbab1e1897cbeb SHA1 5a06df62273146890585fc457f5bda9c2c77b13e SHA256 73c9cfa1006c6bca43d677a60ca8b2e30bca3b17c9855d11812afffa35542568
@@ -8,7 +12,15 @@ DIST gst-ffmpeg-0.10.13.tar.bz2 4784059 RMD160 3e5e3d44302665214cfde8a908b633f8d
 DIST gst-ffmpeg-0.10.9.tar.bz2 3310276 RMD160 07d0ac35a7896058b827992a07bd4f8501c0abc0 SHA1 88b68958680d345ebb7b261dbabd12b5908869ef SHA256 63ed1b3c7d548bed4ad50e05b14374cdb0d91e3bfac19248d68c7144bf2c8f15
 EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1145 RMD160 75dc398a62cfe09db771dd4ddddb319371177e23 SHA1 25f706c32cc259786e6a5567a71ac20796842955 SHA256 571840df64030a80ab1ecc2adb7934a0ee74f1674ac7b2d4c210dc44c2bb46ec
 EBUILD gst-plugins-ffmpeg-0.10.12.ebuild 1151 RMD160 2dcc346d717f6a2f1e2ff73634b9bd5a3a5d029e SHA1 38f663476943b1728241a5713644f2542e64f51b SHA256 880ad8ef48ed5b54384eaeb38e574752fc463f02c29fffaa48e16e183c68a642
-EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1359 RMD160 41e6ea84f725766b73ff07e5b3a272bd50df9286 SHA1 cd7159eb4938d233592c2e8687a89f8123bb731c SHA256 7ce714fbe36fee55f2a6a508976f1a6138ba9d1b47c92a7c687b23adb6f8c2df
+EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1253 RMD160 0193c2cac34ca2c596aa3fc40d9d242005cbe50d SHA1 b2c4c256b24930eb10dc26d8807af6419590018b SHA256 115198bcf52f442d9e52340cd15e322ec4211d655c7e36dfa1f7dfd0fdbaa8c8
 EBUILD gst-plugins-ffmpeg-0.10.9.ebuild 1099 RMD160 75cab3594a71166915fff6716f367db1ee94a7dc SHA1 bd0565298993312690bb644163017445e7e7d6a6 SHA256 aa95723c666b02d62e52b54b35fd9ee7d8c5b9f177476514dc34eb1957cc6084
-MISC ChangeLog 20308 RMD160 24fda467078e0ee98cee1ae574654cc07e4e263d SHA1 2443c7f7a39aabc786af4e957b0335bf0730193e SHA256 32371e5f6fc3a75fef93a9bd36bc271eb66da2c62e4478cce4b5d78c18ccecb0
-MISC metadata.xml 264 RMD160 9e17098b32d9b16c785b5bda193500e843745343 SHA1 b505a9b3a1992a61086358a493a6ce750d2a81b3 SHA256 a053184e372ce913d7a090af0ab03d4959c76ff39e5afc64eeb901603b730d65
+MISC ChangeLog 20487 RMD160 ff380e8d561c60b1db2e72ca3133317e4e5bf44f SHA1 a0b20b0249ade9fe69acfe5ed0774088e53aa5da SHA256 8a9588c24dc46e03f149452c95b96d03bbf370237bdc378992216b66bce4eeb4
+MISC metadata.xml 261 RMD160 9567f7dcfbb864e6fea6dbf4ccaf210edc1e48c5 SHA1 07b7ce712bd1743f31aae9a9c00b7ca7c4c742dd SHA256 18c54afc2f28657fd40f56015d323fd8346d29491a58b812870831e64fbd03a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/bTakACgkQgAnW8HDreRY4CQCeOzNZMzPdVyIeoyMiqo5LHTGX
+5awAn3rwilo8b0vD7/VrF7vJiL3U93dO
+=3air
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch
new file mode 100644
index 000000000000..794495b01d2a
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13-gcc-4.7.patch
@@ -0,0 +1,42 @@
+--- ./gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
++++ ./gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
+@@ -398,7 +398,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst,
+             "2:                         \n\t"\
+             \
+             : "+a"(src), "+c"(dst)\
+-            : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
++            : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
+             : "memory"\
+         );\
+         src += 4-(h+5)*srcStride;\
+@@ -446,7 +446,7 @@ static av_always_inline void OPNAME ## h264_qpel8or16_hv1_lowpass_ ## MMX(int16_
+             QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
+             "2:                     \n\t"\
+             : "+a"(src)\
+-            : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
++            : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
+             : "memory"\
+             );\
+         tmp += 4;\
+@@ -823,7 +823,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst,
+         "2:                          \n\t"\
+         \
+         : "+a"(src), "+c"(dst)\
+-        : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
++        : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
+         : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
+                        "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
+           "memory"\
+@@ -878,7 +878,7 @@ static av_always_inline void put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp, u
+             QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
+             "2:                         \n\t"
+             : "+a"(src)
+-            : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
++            : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
+             : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
+                            "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
+               "memory"
+-- 
+1.7.9
+
+
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
index 5c843bc1c4a5..29cfb3330c33 100644
--- 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
@@ -1,10 +1,10 @@
 # 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.2 2012/05/05 08:27:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r1.ebuild,v 1.3 2012/06/15 14:58:44 jlec Exp $
 
-EAPI=1
+EAPI=4
 
-inherit flag-o-matic eutils base
+inherit base eutils flag-o-matic
 
 PD=${FILESDIR}/${PV}
 MY_PN=${PN/-plugins}
@@ -31,7 +31,9 @@ RDEPEND=">=media-libs/gstreamer-0.10.31
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_compile() {
+PATCHES=( "${FILESDIR}"/${PV}-gcc-4.7.patch )
+
+src_configure() {
 	append-flags -fno-strict-aliasing
 
 	if ! use hardened; then
@@ -41,11 +43,4 @@ src_compile() {
 		econf $(use_enable orc) \
 			--with-ffmpeg-extra-configure='--disable-mmx --disable-mmx2'
 	fi
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-plugins/gst-plugins-ffmpeg/metadata.xml b/media-plugins/gst-plugins-ffmpeg/metadata.xml
index 61f09143c449..1e851910a311 100644
--- a/media-plugins/gst-plugins-ffmpeg/metadata.xml
+++ b/media-plugins/gst-plugins-ffmpeg/metadata.xml
@@ -5,5 +5,5 @@
 	<use>
 		<flag name="orc">Use <pkg>dev-lang/orc</pkg> for runtime
 			optimisations</flag>
-    </use>
+	</use>
 </pkgmetadata>