summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2015-11-20 18:33:37 +0000
committertron <tron@pkgsrc.org>2015-11-20 18:33:37 +0000
commita765cb2a200b77de32d9e5e9c3da07afee3aa8e2 (patch)
tree13eae957faf2ef107fa5cc0cd094e997bc469a5b /multimedia
parent4fd66082716638c53eaa2c736568429ca3e356ff (diff)
downloadpkgsrc-a765cb2a200b77de32d9e5e9c3da07afee3aa8e2.tar.gz
Add patch from the GIT repository to fix the build with version 1.5.0
or newer of libvpx.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg2/distinfo3
-rw-r--r--multimedia/ffmpeg2/patches/patch-libavcodec_libvpxenc.c28
2 files changed, 30 insertions, 1 deletions
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index fe67144c53d..ba01d793c0d 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2015/11/13 20:20:08 adam Exp $
+$NetBSD: distinfo,v 1.41 2015/11/20 18:33:37 tron Exp $
SHA1 (ffmpeg-2.8.2.tar.bz2) = 1952aeb9ec3f569514d8db4f30c195b765392639
RMD160 (ffmpeg-2.8.2.tar.bz2) = cee6a076bead7cefb9e0c562e95465855c2c002c
@@ -6,6 +6,7 @@ SHA512 (ffmpeg-2.8.2.tar.bz2) = 15c1c09d7d4bb8cc7babff4c782e4bf6621ed86d6b02bffb
Size (ffmpeg-2.8.2.tar.bz2) = 8573586 bytes
SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
SHA1 (patch-configure) = bc0dcdb5605b5a112de556ecb466265ef8ff5ca9
+SHA1 (patch-libavcodec_libvpxenc.c) = ca50671633f1d1cb321ea0692d70351b452be624
SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
diff --git a/multimedia/ffmpeg2/patches/patch-libavcodec_libvpxenc.c b/multimedia/ffmpeg2/patches/patch-libavcodec_libvpxenc.c
new file mode 100644
index 00000000000..cb8daa9cbcc
--- /dev/null
+++ b/multimedia/ffmpeg2/patches/patch-libavcodec_libvpxenc.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-libavcodec_libvpxenc.c,v 1.1 2015/11/20 18:33:38 tron Exp $
+
+Fix build with libvpx version 1.5.0 and newer. Fix taken from here:
+
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab#patch1
+
+--- libavcodec/libvpxenc.c.orig 2015-09-09 02:17:45.000000000 +0100
++++ libavcodec/libvpxenc.c 2015-11-20 18:25:02.000000000 +0000
+@@ -104,19 +104,11 @@
+
+ /** 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",