From 21ece9172f17774d4bdbcf73f670ff3d94079e84 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 15 Dec 2014 21:12:14 +0000 Subject: gstreamer0.10-ffmpeg: update to 0.10.13-2 --- abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD | 28 ++++++++-------- .../community/gstreamer0.10-ffmpeg/cmp_error.patch | 39 ---------------------- 2 files changed, 14 insertions(+), 53 deletions(-) delete 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 e6a0dc3..4330aa4 100644 --- a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD +++ b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 147131 2012-01-22 11:26:07Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot pkgname=gstreamer0.10-ffmpeg pkgver=0.10.13 -pkgrel=1 +pkgrel=2 pkgdesc="Gstreamer FFMpeg Plugin" arch=('i686' 'x86_64') license=('GPL') depends=('gstreamer0.10-base' 'bzip2') -makedepends=('pkgconfig' 'yasm' 'sdl') +makedepends=('pkgconfig' 'yasm' 'sdl' 'git' 'gtk-doc') url="http://www.gstreamer.net" groups=('gstreamer0.10-plugins') -options=('!libtool') -source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2 cmp_error.patch) +source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-ffmpeg#commit=94e587b9182c6d2fde9a61c9def790c8047453c0") +sha256sums=('SKIP') build() { - cd "${srcdir}/gst-ffmpeg-${pkgver}" - patch -Np1 < $srcdir/cmp_error.patch - unset CFLAGS - unset CXXFLAGS - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" + cd gst-ffmpeg + NOCONFIGURE=1 ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --enable-gtk-doc --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" make } -package() { - cd "${srcdir}/gst-ffmpeg-${pkgver}" +check() { + cd gst-ffmpeg + make check +} +package() { + cd gst-ffmpeg 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 deleted file mode 100644 index 602a57f..0000000 --- a/abs/extra/community/gstreamer0.10-ffmpeg/cmp_error.patch +++ /dev/null @@ -1,39 +0,0 @@ -=================================================================== ---- 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