Import of pkgsrc-2016Q3

multimedia/ffmpeg010/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2015/06/30 09:57:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2016/08/17 00:06:39 ryoon Exp $
 
 PKGNAME=	ffmpeg010-20150312.${DISTVERSION}
-PKGREVISION=	1
+PKGREVISION=	4
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v0.10)
@@ -38,7 +38,7 @@ CONF_FILES+=	${PREFIX}/share/examples/ffmpeg010/ffserver.conf \
    || !empty(CC_VERSION:Mgcc-4.[01].*) \
    || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=	--disable-asm
-.elif !empty(CC_VERSION:Mgcc-4.*)
+.elif !empty(CC_VERSION:Mgcc-[456].*)
 CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4
 .endif
 .endif

multimedia/ffmpeg010/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2015/06/30 10:02:22 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2016/08/17 00:06:39 ryoon Exp $
 
 BUILDLINK_TREE+=	ffmpeg010
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ffmpeg010
 FFMPEG010_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ffmpeg010+=	ffmpeg010>=20120609.0.10.4
-BUILDLINK_ABI_DEPENDS.ffmpeg010?=	ffmpeg010>=20150312.0.10.16nb1
+BUILDLINK_ABI_DEPENDS.ffmpeg010?=	ffmpeg010>=20150312.0.10.16nb4
 BUILDLINK_PKGSRCDIR.ffmpeg010?=	../../multimedia/ffmpeg010
 
 BUILDLINK_INCDIRS.ffmpeg010+=		include/ffmpeg010

multimedia/ffmpeg010/distinfo

@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.12 2015/03/14 16:14:43 tnn 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
+SHA512 (ffmpeg-0.10.16.tar.bz2) = 3e4a7a0011d598dd4842056aebeb4cf60fc81c96a530fdfa83d0b7e47bdc032e56368af127a18dce928ff030cb905ede527ca470fb6a3dbecdc1f78c4d840a8a
 Size (ffmpeg-0.10.16.tar.bz2) = 5837552 bytes
 SHA1 (patch-aa) = b30c822e03bb1766181d7b8b8d4122c196fd1d16
 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

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",