Updated the PKGBUILD.

It is now up-to-date with the ffmpeg package
in the official Arch repositories. Also, say
hello to your new maintainer!

Signed-off-by: Kamran Mackey <kamranm1200@gmail.com>

2 files changed, 93 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 11b915f7e056..a1a0f40a42f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer:  richteer <richteer at lastprime.net>
+# Maintainer:  Kamran Mackey <kamranm1200@gmail.com>
+# Contributor: richteer <richteer at lastprime.net>
 # Contributor: DrZaius <lou at fakeoutdoorsman.com>
 
 pkgname=ffmpeg-git
-pkgver=r74550.907373e
+pkgver=r77404.70f13ab
 pkgrel=1
-pkgdesc="Universal multimedia toolkit"
+pkgdesc="Complete solution to record, convert and stream audio and video (git version)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://ffmpeg.org/"
@@ -12,8 +13,15 @@ depends=('alsa-lib' 'bzip2' 'freetype2' 'gnutls' 'lame' 'libass' 'libfdk-aac' 'l
 makedepends=('git' 'yasm')
 conflicts=('ffmpeg')
 provides=("ffmpeg=$pkgver" "qt-faststart")
-source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
-md5sums=('SKIP')
+source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git'
+	ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch)
+md5sums=('SKIP'
+         'SKIP')
+
+prepare() {
+  cd "$srcdir/$pkgname"
+  patch -p1 -i ../ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+}
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -23,26 +31,46 @@ pkgver() {
 build() {
   cd "$srcdir/$pkgname"
 
-  ./configure            \
-    --prefix=/usr        \
-    --shlibdir=/usr/lib  \
-	--pkg-config-flags="--static" \
-    --disable-static     \
-    --enable-gpl         \
-	--enable-gnutls      \
-    --enable-libass      \
-    --enable-libfdk-aac  \
+  ./configure \
+    --prefix=/usr \
+    --disable-debug \
+    --disable-static \
+    --disable-stripping \
+    --enable-avisynth \
+    --enable-avresample \
+    --enable-fontconfig \
+    --enable-gnutls \
+    --enable-gpl \
+    --enable-ladspa \
+    --enable-libass \
+    --enable-libbluray \
+    --enable-libdcadec \
     --enable-libfreetype \
-    --enable-libmp3lame  \
-    --enable-libopus     \
-    --enable-libtheora   \
-    --enable-libvorbis   \
-    --enable-libvpx      \
-    --enable-libx264     \
-    --enable-libx265     \
-    --enable-nonfree     \
-    --enable-shared      \
-    --enable-x11grab     \
+    --enable-libfribidi \
+    --enable-libgsm \
+    --enable-libmodplug \
+    --enable-libmp3lame \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libpulse \
+    --enable-libschroedinger \
+    --enable-libsoxr \
+    --enable-libspeex \
+    --enable-libssh \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvidstab \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libwebp \
+    --enable-libx264 \
+    --enable-libx265 \
+    --enable-libxvid \
+    --enable-shared \
+    --enable-version3 \
+    --enable-x11grab \
 
   make
   make tools/qt-faststart
diff --git a/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
new file mode 100644
index 000000000000..15d2600d1c47
--- /dev/null
+++ b/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
@@ -0,0 +1,41 @@
+From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Mon, 19 Oct 2015 22:44:11 -0700
+Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
+
+VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+from libvpx and the remaining values were never used here
+
+Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
+Signed-off-by: James Zern <jzern@google.com>
+---
+ libavcodec/libvpxenc.c |    8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 5f39783..992122c 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
+ 
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *const ctlidstr[] = {
+-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
+-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
+-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
+-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
+-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
+-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
+     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
+     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
+     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
+     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
+     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
+-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
+     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
+     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
+     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
+-- 
+1.7.10.4
+