diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
commit | 4a534f68f38c221a2276fa791e086c3848ce515d (patch) | |
tree | 7963845c02cde2b1f4a4fb8a6c6cfa497b5ee5d5 /extra/ffmpeg/PKGBUILD | |
parent | d5acc51bdb801d2bb930af53220946e739dd5edd (diff) | |
parent | 738e6c6d93b4c7118e49b38c610abed8b7f7d55a (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/calibre/PKGBUILD
community/ffmpeg2theora/PKGBUILD
core/e2fsprogs/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/ffmpeg/PKGBUILD
multilib/lib32-alsa-lib/PKGBUILD
multilib/lib32-alsa-oss/PKGBUILD
multilib/lib32-alsa-plugins/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
staging/transcode/PKGBUILD
staging/vlc/PKGBUILD
Diffstat (limited to 'extra/ffmpeg/PKGBUILD')
-rw-r--r-- | extra/ffmpeg/PKGBUILD | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index a9ffd7fae..94da7ae73 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146495 2012-01-11 22:55:38Z ibiru $ +# $Id: PKGBUILD 147716 2012-01-27 11:08:09Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20120111 +pkgver=20120127 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -18,9 +18,8 @@ else makedepends=('yasm' 'git' 'libvdpau') fi #git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz - revert-enabling-threads.patch - ffmpeg-loongson.patch) +source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) +md5sums=('dc706cdb31801b4746f37459b0c38b7e') build() { cd "$srcdir/$pkgname" @@ -33,8 +32,6 @@ build() { extraconf="" fi - patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch" - ./configure \ --prefix=/usr \ --enable-libmp3lame \ |