diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-17 12:10:05 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-17 12:10:05 +0200 |
| commit | f5960fe27a2d814eab2ac7efacd714322c18a7b7 (patch) | |
| tree | 4961d39c9af71f05b5b6ba9f4a23c47963193d37 /extra/ffmpeg | |
| parent | 1d26d40c2055019b7eb001251919aa73baae0029 (diff) | |
| parent | 74952c750361d72d7b2d14179d4e88b6ce0a0c7e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bsdiff/PKGBUILD
community/drivel/PKGBUILD
community/dvdbackup/PKGBUILD
community/gdlmm/PKGBUILD
community/gnome-phone-manager/PKGBUILD
community/highlight/PKGBUILD
community/i3-wm/PKGBUILD
community/linux-tools/PKGBUILD
community/obconf/PKGBUILD
community/perl-class-factory-util/PKGBUILD
community/python-mpi4py/PKGBUILD
community/qupzilla/PKGBUILD
community/subtitleeditor/PKGBUILD
community/synce-librapi/PKGBUILD
community/synce-libsynce/PKGBUILD
community/tilda/PKGBUILD
core/glibc/PKGBUILD
core/iputils/PKGBUILD
extra/alsa-tools/PKGBUILD
extra/calligra/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kobodeluxe/PKGBUILD
extra/libburn/PKGBUILD
extra/libisoburn/PKGBUILD
extra/libisofs/PKGBUILD
extra/libsamplerate/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/nasm/PKGBUILD
extra/perl-netaddr-ip/PKGBUILD
extra/perl-template-toolkit/PKGBUILD
extra/putty/PKGBUILD
extra/samba/PKGBUILD
extra/tk/PKGBUILD
extra/vim/PKGBUILD
extra/xorg-xprop/PKGBUILD
extra/xorg-xwd/PKGBUILD
pcr/ams/PKGBUILD
pcr/clalsadrv/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 94d69acbf..17525f0b1 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191951 2013-08-01 20:53:41Z bpiotrowski $ +# $Id: PKGBUILD 192419 2013-08-11 13:05:15Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('940e1bc4f3e185364099b4ba60d4b952615a4232c5641baa3e9f45d4d748130c') +sha256sums=('611eae7e3485d5fd9ff03e0ac7575ea89bc8105e40e99a40de02324957482f95') build() { cd $pkgname-$pkgver |