summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky2015-07-17 20:09:27 -0700
committerBen Widawsky2015-07-17 20:22:42 -0700
commitb7161e51b0e80dd13a0add1e6f7b4347b0554d9e (patch)
tree4e8093a5ae16f27f431f1d742b82531028678413
parent33fd2cf61704e814a34dd36ac97bf93a3e64f7f8 (diff)
downloadaur-b7161e51b0e80dd13a0add1e6f7b4347b0554d9e.tar.gz
Merge with latest upstream PKGBUILD
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD12
2 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ffbd4219e88..fee15312cadc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,7 @@ pkgbase = ffmpeg-libfdk_aac
url = http://ffmpeg.org/
arch = i686
arch = x86_64
- license = GPL
+ license = GPL3
license = custom
makedepends = libvdpau
makedepends = yasm
@@ -24,6 +24,7 @@ pkgbase = ffmpeg-libfdk_aac
depends = libpulse
depends = libtheora
depends = libva
+ depends = libwebp
depends = opencore-amr
depends = openjpeg
depends = opus
diff --git a/PKGBUILD b/PKGBUILD
index aa8278525626..b0d149797caf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer: Ben Widawsky <ben@bwidawsk.net>
+# Contributor: Rob McCathie <korrode at gmail>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Rob McCathie <korrode at gmail>
+# Contributor: Maxime Gauduin <alucryd@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
@@ -13,12 +14,12 @@ epoch=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution (Same as official package except with libfdk-aac support)"
arch=('i686' 'x86_64')
url='http://ffmpeg.org/'
-license=('GPL' 'custom')
+license=('GPL3' 'custom')
depends=(
'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau'
- 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'opencore-amr'
- 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore'
- 'zlib' 'fribidi' 'libssh'
+ 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libwebp'
+ 'opencore-amr' 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils'
+ 'xvidcore' 'zlib' 'fribidi' 'libssh'
'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so'
'libfdk-aac'
)
@@ -60,6 +61,7 @@ build() {
--enable-libv4l2 \
--enable-libvorbis \
--enable-libvpx \
+ --enable-libwebp \
--enable-libx264 \
--enable-libx265 \
--enable-libxvid \