From 79da941af4872cfdbc6d7b4234c4bdffb4728db1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 28 Jan 2016 15:04:39 +0000
Subject: ffmpeg-compat: rebuild for libvpx

---
 abs/extra/ffmpeg-compat/PKGBUILD                   | 16 ++++++++++++---
 .../ffmpeg-compat/ffmpeg-0.10-libvpx-1.5.patch     | 24 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 abs/extra/ffmpeg-compat/ffmpeg-0.10-libvpx-1.5.patch

diff --git a/abs/extra/ffmpeg-compat/PKGBUILD b/abs/extra/ffmpeg-compat/PKGBUILD
index 258f4d8..5b5879f 100644
--- a/abs/extra/ffmpeg-compat/PKGBUILD
+++ b/abs/extra/ffmpeg-compat/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=ffmpeg-compat
 pkgver=0.10.16
-pkgrel=2
+pkgrel=4
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
@@ -20,10 +20,20 @@ depends=(
       'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so'
 )
 makedepends=('libvdpau' 'yasm' 'x264')
-source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2{,.asc})
+provides=('libavcodec.so' 'libavutil.so' 'libpostproc.so' 'libswscale.so'
+          'libswresample.so' 'libavformat.so' 'libavfilter.so' 'libavdevice.so')
+source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2{,.asc}
+        ffmpeg-0.10-libvpx-1.5.patch)
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
 sha256sums=('e77823cbd58dfdb61f88059476070bc432d80e3821c14abcf804ef709d2f3fd1'
-            'SKIP')
+            'SKIP'
+            'd6797973889582b82b7c81b91a39c222e09b5ccf8a7e031c364ae1e9275a497d')
+
+
+prepare() {
+  cd ffmpeg-$pkgver
+  patch -p1 -i ../ffmpeg-0.10-libvpx-1.5.patch
+}
 
 build() {
   cd ffmpeg-$pkgver
diff --git a/abs/extra/ffmpeg-compat/ffmpeg-0.10-libvpx-1.5.patch b/abs/extra/ffmpeg-compat/ffmpeg-0.10-libvpx-1.5.patch
new file mode 100644
index 0000000..740bb74
--- /dev/null
+++ b/abs/extra/ffmpeg-compat/ffmpeg-0.10-libvpx-1.5.patch
@@ -0,0 +1,24 @@
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 1d33ce9..dface51 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext {
+ 
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *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",
-- 
cgit v0.12