diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
| commit | 93db7f2fb23cba78cde4343b506a676e376ca4a8 (patch) | |
| tree | 3fec56215a344b1e01e49a27198f919ac981320b /extra/ffmpeg | |
| parent | c162e34d12c6cf76532a7f6b3d538d493a8bf17a (diff) | |
| parent | 39e9111d76d232d65ca0c43285dea5bd5d58d28e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/gnome-menus2/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpsim/PKGBUILD
community/kgraphviewer/PKGBUILD
community/kpovmodeler/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/python-basemap/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
community/qgo/PKGBUILD
community/ude/PKGBUILD
community/virtkey/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/aterm/PKGBUILD
extra/cups-pdf/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/libffado/PKGBUILD
extra/libtar/PKGBUILD
extra/maxima/PKGBUILD
extra/php-xcache/PKGBUILD
extra/postgresql/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xauth/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 17525f0b1..c533c25eb 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 192419 2013-08-11 13:05:15Z bpiotrowski $ +# $Id: PKGBUILD 196252 2013-10-09 20:32:23Z 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.1 -pkgrel=1 +pkgver=2.0.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' 'fontconfig' 'gsm' 'lame' 'libass' + 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libvorbis' 'libvpx' 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'x264' 'xvidcore' 'zlib' 'libxfixes' @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('611eae7e3485d5fd9ff03e0ac7575ea89bc8105e40e99a40de02324957482f95') +sha256sums=('986f63dc0785f473b1832d0eead502e39c9706fbe7f9677bbea0dad6fe0fab4a') build() { cd $pkgname-$pkgver @@ -41,6 +41,7 @@ build() { --enable-avresample \ --enable-dxva2 \ --enable-fontconfig \ + --enable-gnutls \ --enable-gpl \ --enable-libass \ --enable-libbluray \ |