summaryrefslogtreecommitdiff
path: root/extra/ffmpeg
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-02-17 10:46:15 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-02-17 10:46:15 +0100
commite30ba9d4c857530c2fbb3cc82236a49676d5ebc9 (patch)
tree966498ac914356462e691b8e550ab1f1d069074c /extra/ffmpeg
parent69f67102b7a02871e32a079ffb789d5fca72a746 (diff)
parentc6f4cd18ab706868be0eff10327a0dcd58cecdf3 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/cantata/PKGBUILD community/ffmpeg-compat/PKGBUILD community/v8/PKGBUILD core/e2fsprogs/PKGBUILD core/groff/PKGBUILD core/openssl/PKGBUILD extra/avidemux/PKGBUILD extra/ffmpeg/PKGBUILD extra/glpk/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/mediastreamer/PKGBUILD extra/netcdf/PKGBUILD extra/octave/PKGBUILD extra/opal/PKGBUILD extra/sox/PKGBUILD extra/x264/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
-rw-r--r--extra/ffmpeg/PKGBUILD59
1 files changed, 35 insertions, 24 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 89ec16f29..624bdcbff 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 172943 2012-12-07 18:27:01Z ibiru $
+# $Id: PKGBUILD 178128 2013-02-16 22:48:47Z ioni $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=1.0.1
-pkgrel=1.1
+pkgver=1.1.2
+pkgrel=2
epoch=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')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib libxfixes)
-makedepends=('git')
+depends=(
+ 'alsa-lib' 'bzip2' 'fontconfig' 'gsm' 'lame' 'libass'
+ 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libvorbis' 'libvpx'
+ 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
+ 'v4l-utils' 'x264' 'xvidcore' 'zlib'
+ )
if [ "${CARCH}" != "mips64el" ]; then
depends+=('libva')
- makedepends+=('yasm' 'libvdpau')
+ makedepends=('yasm' 'libvdpau')
fi
source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('dbbb88ce5525dea22b24aaa098a9bcc2')
+sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce')
build() {
cd $pkgname-$pkgver
@@ -34,31 +38,38 @@ build() {
./configure \
--prefix=/usr \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libxvid \
- --enable-libx264 \
- --enable-libvpx \
- --enable-libtheora \
+ --disable-debug \
+ --disable-static \
+ --enable-avresample \
+ --enable-fontconfig \
+ --enable-gpl \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-libfreetype \
--enable-libgsm \
- --enable-libspeex \
- --enable-postproc \
- --enable-shared \
- --enable-x11grab \
+ --enable-libmodplug \
+ --enable-libmp3lame \
--enable-libopencore_amrnb \
--enable-libopencore_amrwb \
- --enable-libschroedinger \
--enable-libopenjpeg \
- --enable-librtmp \
+ --enable-libopus \
--enable-libpulse \
+ --enable-librtmp \
+ --enable-libschroedinger \
+ --enable-libspeex \
+ --enable-libtheora \
--enable-libv4l2 \
- --enable-gpl \
- --enable-version3 \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libx264 \
+ --enable-libxvid \
+ --enable-postproc \
--enable-runtime-cpudetect \
- --disable-static \
- --disable-debug \
+ --enable-shared \
+ --enable-version3 \
+ --enable-x11grab \
$extraconf
-
+
make
make tools/qt-faststart
make doc/ff{mpeg,play,server}.1