diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-13 11:55:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-13 11:55:35 -0300 |
| commit | 69fbf2ca624da30dfaefb4c4150715df81d8cf00 (patch) | |
| tree | 43a6191492a1d6a8b2dbf3a5fc30e04418407eff /extra/ffmpeg | |
| parent | 20325742c50f83cc58e49aa3b8347fde1399d734 (diff) | |
| parent | cb9c375209c236c16557878a1b864f91de27b88d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ctpl/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/subversion/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 7125acf0d..821fe2277 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 143216 2011-11-23 13:53:15Z ibiru $ +# $Id: PKGBUILD 144952 2011-12-11 23:12:10Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20111123 +pkgver=20111211 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" license=('GPL') +<<<<<<< HEAD if [ "${CARCH}" = "mips64el" ] ; then - depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libxfixes' 'schroedinger' 'libvpx' 'openjpeg' 'rtmpdump' 'speex' 'gsm') - makedepends=('git' 'pkg-config') + depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) + makedepends=('git') else - depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm') - makedepends=('yasm' 'git' 'pkg-config') + depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvdpau libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) + makedepends=('yasm' 'git') fi #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) -md5sums=('8ec30d05efe0f6cc6f702933e6781e8e' +md5sums=('75d512bf5137d0b055e54313702ef5fc' '99d412cb539f328dbc37d5ead3407fc7') build() { @@ -52,6 +53,7 @@ build() { --enable-libschroedinger \ --enable-libopenjpeg \ --enable-librtmp \ + --enable-libpulse \ --enable-gpl \ --enable-version3 \ --enable-runtime-cpudetect \ |