Fri Nov 20 18:36:12 2015 UTC ()
Fix build with libvpx-1.5.0 with upstream patch


(ryoon)
diff -r1.13 -r1.14 pkgsrc/multimedia/ffmpeg010/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ffmpeg010/patches/patch-libavcodec_libvpxenc.c
diff -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg1/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ffmpeg1/patches/patch-libavcodec_libvpxenc.c
cvs diff -r1.13 -r1.14 pkgsrc/multimedia/ffmpeg010/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg010/Attic/distinfo 2015/11/03 23:54:24 1.13
+++ pkgsrc/multimedia/ffmpeg010/Attic/distinfo 2015/11/20 18:36:12 1.14
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.13 2015/11/03 23:54:24 agc Exp $ 1$NetBSD: distinfo,v 1.14 2015/11/20 18:36:12 ryoon Exp $
2 2
3SHA1 (ffmpeg-0.10.16.tar.bz2) = d0878e389a38150d7a55d86330a18770015a6ac6 3SHA1 (ffmpeg-0.10.16.tar.bz2) = d0878e389a38150d7a55d86330a18770015a6ac6
4RMD160 (ffmpeg-0.10.16.tar.bz2) = e264172b0852f6b35dc64b1117404f8d3579709c 4RMD160 (ffmpeg-0.10.16.tar.bz2) = e264172b0852f6b35dc64b1117404f8d3579709c
5SHA512 (ffmpeg-0.10.16.tar.bz2) = 3e4a7a0011d598dd4842056aebeb4cf60fc81c96a530fdfa83d0b7e47bdc032e56368af127a18dce928ff030cb905ede527ca470fb6a3dbecdc1f78c4d840a8a 5SHA512 (ffmpeg-0.10.16.tar.bz2) = 3e4a7a0011d598dd4842056aebeb4cf60fc81c96a530fdfa83d0b7e47bdc032e56368af127a18dce928ff030cb905ede527ca470fb6a3dbecdc1f78c4d840a8a
6Size (ffmpeg-0.10.16.tar.bz2) = 5837552 bytes 6Size (ffmpeg-0.10.16.tar.bz2) = 5837552 bytes
7SHA1 (patch-aa) = b30c822e03bb1766181d7b8b8d4122c196fd1d16 7SHA1 (patch-aa) = b30c822e03bb1766181d7b8b8d4122c196fd1d16
8SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f 8SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
9SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2 9SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2
10SHA1 (patch-configure) = 3c275a594dc18eb60236f8a80dcd627ce4671e1a 10SHA1 (patch-configure) = 3c275a594dc18eb60236f8a80dcd627ce4671e1a
11SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24 11SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24
 12SHA1 (patch-libavcodec_libvpxenc.c) = 811d8bc771982123120337841f2025811af6950d
12SHA1 (patch-libavformat_nutdec.c) = eb16a4d2757bfc13a745cc62fab7711897bdeb30 13SHA1 (patch-libavformat_nutdec.c) = eb16a4d2757bfc13a745cc62fab7711897bdeb30
File Added: pkgsrc/multimedia/ffmpeg010/patches/Attic/patch-libavcodec_libvpxenc.c
$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",
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg1/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg1/Attic/distinfo 2015/11/03 23:54:24 1.8
+++ pkgsrc/multimedia/ffmpeg1/Attic/distinfo 2015/11/20 18:36:12 1.9
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.8 2015/11/03 23:54:24 agc Exp $ 1$NetBSD: distinfo,v 1.9 2015/11/20 18:36:12 ryoon Exp $
2 2
3SHA1 (ffmpeg-1.2.12.tar.bz2) = ae7328442046f2c92e7909e66e91034e8072c78b 3SHA1 (ffmpeg-1.2.12.tar.bz2) = ae7328442046f2c92e7909e66e91034e8072c78b
4RMD160 (ffmpeg-1.2.12.tar.bz2) = 38fd1f46a516310e80a7ea22ae09ef6968864d6f 4RMD160 (ffmpeg-1.2.12.tar.bz2) = 38fd1f46a516310e80a7ea22ae09ef6968864d6f
5SHA512 (ffmpeg-1.2.12.tar.bz2) = 87d9ab11713b0fd41e3092272dd64f76fe25af8837d9e1c8162df9747f9b7ab6ea26bb201de7820e57de3103e8723019981b5d8c1d5db13ab39131f618c30da2 5SHA512 (ffmpeg-1.2.12.tar.bz2) = 87d9ab11713b0fd41e3092272dd64f76fe25af8837d9e1c8162df9747f9b7ab6ea26bb201de7820e57de3103e8723019981b5d8c1d5db13ab39131f618c30da2
6Size (ffmpeg-1.2.12.tar.bz2) = 5974419 bytes 6Size (ffmpeg-1.2.12.tar.bz2) = 5974419 bytes
7SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d 7SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d
8SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 8SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
9SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e 9SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
10SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14 10SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14
 11SHA1 (patch-libavcodec_libvpxenc.c) = e6a0b2cde16952ee0e00521898ae85119b7dcb66
11SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a 12SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 603eb10a316edf48e50f64f048772ad4b97cac5a
File Added: pkgsrc/multimedia/ffmpeg1/patches/Attic/patch-libavcodec_libvpxenc.c
$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",