From e495b366798a35166e4bf6da2f86aea2dbccc421 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 15 Aug 2012 10:40:59 -0500
Subject: gstreamd-ffmpeg .10.13
---
abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD | 24 +++++++------
.../community/gstreamer0.10-ffmpeg/cmp_error.patch | 39 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 10 deletions(-)
create mode 100644 abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch
diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
index 7922430..e6a0dc3 100644
--- a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
+++ b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 72240 2010-03-13 20:27:01Z ibiru $
+# $Id: PKGBUILD 147131 2012-01-22 11:26:07Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gstreamer0.10-ffmpeg
-pkgver=0.10.10
+pkgver=0.10.13
pkgrel=1
pkgdesc="Gstreamer FFMpeg Plugin"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('gstreamer0.10-base>=0.10.30' 'bzip2')
-makedepends=('pkgconfig')
+depends=('gstreamer0.10-base' 'bzip2')
+makedepends=('pkgconfig' 'yasm' 'sdl')
url="http://www.gstreamer.net"
groups=('gstreamer0.10-plugins')
-source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
-sha256sums=('697114483444a0a469028857a1d58145c99e6f5d2cd7edd8cb04cdc3fc72ad94')
+options=('!libtool')
+source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2 cmp_error.patch)
build() {
cd "${srcdir}/gst-ffmpeg-${pkgver}"
+ patch -Np1 < $srcdir/cmp_error.patch
unset CFLAGS
unset CXXFLAGS
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
- make || return 1
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect"
+ make
}
+
package() {
cd "${srcdir}/gst-ffmpeg-${pkgver}"
- make DESTDIR="${pkgdir}" install || return 1
- rm -f ${pkgdir}/usr/lib/gstreamer-0.10/*.{l,}a
+
+ make DESTDIR="${pkgdir}" install
}
+md5sums=('7f5beacaf1312db2db30a026b36888c4'
+ 'eebcd022f3057c65fb3d0320831af6fe')
diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch b/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch
new file mode 100644
index 0000000..602a57f
--- /dev/null
+++ b/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch
@@ -0,0 +1,39 @@
+===================================================================
+--- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700
++++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700
+@@ -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"
--
cgit v0.12