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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 55 insertions, 13 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/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>