Fix build with libvpx-1.5.0 with upstream patch

4 files changed, 54 insertions, 2 deletions

diff --git a/multimedia/ffmpeg010/distinfo b/multimedia/ffmpeg010/distinfo
index b4f020cab25..1a7d5b05943 100644
--- a/multimedia/ffmpeg010/distinfo
+++ b/multimedia/ffmpeg010/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 23:54:24 agc Exp $
+$NetBSD: distinfo,v 1.14 2015/11/20 18:36:12 ryoon Exp $
 
 SHA1 (ffmpeg-0.10.16.tar.bz2) = d0878e389a38150d7a55d86330a18770015a6ac6
 RMD160 (ffmpeg-0.10.16.tar.bz2) = e264172b0852f6b35dc64b1117404f8d3579709c
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
 SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2
 SHA1 (patch-configure) = 3c275a594dc18eb60236f8a80dcd627ce4671e1a
 SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24
+SHA1 (patch-libavcodec_libvpxenc.c) = 811d8bc771982123120337841f2025811af6950d
 SHA1 (patch-libavformat_nutdec.c) = eb16a4d2757bfc13a745cc62fab7711897bdeb30
diff --git a/multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c b/multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c
new file mode 100644
index 00000000000..24a2ec6854d
--- /dev/null
+++ b/multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavcodec_libvpxenc.c,v 1.1 2015/11/20 18:36:12 ryoon Exp $
+
+https://github.com/FFmpeg/FFmpeg/commit/6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab#diff-2717f08354d3468cf8024461959fcc8a
+
+--- libavcodec/libvpxenc.c.orig	2015-03-12 19:53:52.000000000 +0000
++++ 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",
diff --git a/multimedia/ffmpeg1/distinfo b/multimedia/ffmpeg1/distinfo
index 967a655e4f1..20368adc27d 100644
--- a/multimedia/ffmpeg1/distinfo
+++ b/multimedia/ffmpeg1/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:54:24 agc Exp $
+$NetBSD: distinfo,v 1.9 2015/11/20 18:36:12 ryoon Exp $
 
 SHA1 (ffmpeg-1.2.12.tar.bz2) = ae7328442046f2c92e7909e66e91034e8072c78b
 RMD160 (ffmpeg-1.2.12.tar.bz2) = 38fd1f46a516310e80a7ea22ae09ef6968864d6f
@@ -8,4 +8,5 @@ SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
 SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
 SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14
+SHA1 (patch-libavcodec_libvpxenc.c) = e6a0b2cde16952ee0e00521898ae85119b7dcb66
 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a
diff --git a/multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c b/multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c
new file mode 100644
index 00000000000..df7191d5d37
--- /dev/null
+++ b/multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-libavcodec_libvpxenc.c,v 1.1 2015/11/20 18:36:12 ryoon Exp $
+
+--- libavcodec/libvpxenc.c.orig	2015-02-12 14:38:18.000000000 +0000
++++ libavcodec/libvpxenc.c
+@@ -87,19 +87,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",