[arch-commits] Commit in ffmpeg-compat/trunk (PKGBUILD ffmpeg-0.10-libvpx-1.5.patch)

[Bartłomiej Piotrowski]

    Date: Tuesday, November 10, 2015 @ 19:54:50
  Author: bpiotrowski
Revision: 146522

Fix build with libvpx 1.5

Added:
  ffmpeg-compat/trunk/ffmpeg-0.10-libvpx-1.5.patch
Modified:
  ffmpeg-compat/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   12 ++++++++++--
 ffmpeg-0.10-libvpx-1.5.patch |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-10 18:12:15 UTC (rev 146521)
+++ PKGBUILD	2015-11-10 18:54:50 UTC (rev 146522)
@@ -22,11 +22,19 @@
 makedepends=('libvdpau' 'yasm' 'x264')
 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})
+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
 

Added: ffmpeg-0.10-libvpx-1.5.patch
===================================================================
--- ffmpeg-0.10-libvpx-1.5.patch	                        (rev 0)
+++ ffmpeg-0.10-libvpx-1.5.patch	2015-11-10 18:54:50 UTC (rev 146522)
@@ -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",