[packages/gstreamer0.10-ffmpeg] Compilation fix for x86_64

jajcus jajcus at pld-linux.org
Thu Jan 10 13:09:39 CET 2013


commit 4767057aa9c6952946490507a8c67b6504e5c083
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Thu Jan 10 13:09:13 2013 +0100

    Compilation fix for x86_64

 gst-ffmpeg-gcc4.7-x86_64.patch | 39 +++++++++++++++++++++++++++++++++++++++
 gstreamer0.10-ffmpeg.spec      |  2 ++
 2 files changed, 41 insertions(+)
---
diff --git a/gstreamer0.10-ffmpeg.spec b/gstreamer0.10-ffmpeg.spec
index 52623b5..e872730 100644
--- a/gstreamer0.10-ffmpeg.spec
+++ b/gstreamer0.10-ffmpeg.spec
@@ -19,6 +19,7 @@ Group:		Libraries
 Source0:	http://gstreamer.freedesktop.org/src/gst-ffmpeg/%{gstname}-%{version}.tar.bz2
 # Source0-md5:	7f5beacaf1312db2db30a026b36888c4
 Patch0:		gst-ffmpeg-format_string.patch
+Patch1:		gst-ffmpeg-gcc4.7-x86_64.patch
 URL:		http://gstreamer.net/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
@@ -71,6 +72,7 @@ najpopularniejsze formaty multimedialne.
 %prep
 %setup -q -n %{gstname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/gst-ffmpeg-gcc4.7-x86_64.patch b/gst-ffmpeg-gcc4.7-x86_64.patch
new file mode 100644
index 0000000..3c0f58c
--- /dev/null
+++ b/gst-ffmpeg-gcc4.7-x86_64.patch
@@ -0,0 +1,39 @@
+diff -dur gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
+--- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c	2011-11-02 16:16:24.000000000 +0100
++++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c	2013-01-10 13:04:02.747252213 +0100
+@@ -398,7 +398,7 @@
+             "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 @@
+             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 @@
+         "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 @@
+             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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gstreamer0.10-ffmpeg.git/commitdiff/4767057aa9c6952946490507a8c67b6504e5c083



More information about the pld-cvs-commit mailing list