summaryrefslogtreecommitdiff
path: root/extra/ffmpeg
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-26 13:21:55 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-26 13:21:55 -0300
commit60e119a0f3297314f4bcd2b2b821eccd28992cd6 (patch)
tree83078f34ba0e5220164fe3f3b5cdff27ce87aaf9 /extra/ffmpeg
parent8aa6cf7dacd74c155e7b2dd7af68a5cb4460e5b3 (diff)
parent21efc9511d14394cc1d8426e2e0a6c668964fbe9 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/lightspark/PKGBUILD community/camlp5/PKGBUILD community/gnote/PKGBUILD community/gtk-gnutella/PKGBUILD extra/ffmpeg/PKGBUILD extra/koffice/PKGBUILD extra/pyopenssl/PKGBUILD extra/virtuoso/PKGBUILD gnome-unstable/empathy/PKGBUILD gnome-unstable/epiphany/PKGBUILD gnome-unstable/folks/PKGBUILD gnome-unstable/gdm/PKGBUILD gnome-unstable/gjs/PKGBUILD gnome-unstable/gnome-games/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/gnome-shell/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD gnome-unstable/gthumb/PKGBUILD gnome-unstable/libgnomekbd/PKGBUILD gnome-unstable/libpeas/PKGBUILD gnome-unstable/mutter/PKGBUILD gnome-unstable/totem/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/wine/PKGBUILD testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
-rw-r--r--extra/ffmpeg/PKGBUILD9
1 files changed, 6 insertions, 3 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index f92f76cb0..0bbd13537 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138105 2011-09-16 14:11:53Z ibiru $
+# $Id: PKGBUILD 138450 2011-09-23 13:55:25Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=20110916
+pkgver=20110923
pkgrel=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('yasm' 'git')
#git clone git://git.videolan.org/ffmpeg.git
source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz
ffmpeg-loongson.patch)
-md5sums=('d065a16866c9bcf4d06c5452b2fbdc56'
+md5sums=('36111c640a2eea19f677924ac3193ce4'
'081d03278559a351322157a441fabcf5')
build() {
@@ -47,7 +47,10 @@ build() {
make
make tools/qt-faststart
make doc/ff{mpeg,play,server}.1
+}
+package() {
+ cd "$srcdir/$pkgname"
make DESTDIR="$pkgdir" install install-man
install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
}