Update to upstream version 12.1

PR:		219469
Submitted by:	takefu@airport.fm
Approved by:	maintainer timeout

5 files changed, 34 insertions, 90 deletions

diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 07ebe632fed5..3ccc2b64428d 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libav
-PORTVERSION=	11.8
-PORTREVISION=	2
+PORTVERSION=	12.1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
@@ -11,14 +10,14 @@ COMMENT=	Realtime audio/video conversion library
 
 LICENSE=	GPLv2+
 
+BROKEN_armv6=		fails to compile: cc: warning: joined argument expects additional value: -mcpu=
+
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
 		libgmp.so:math/gmp \
 		libvdpau.so:multimedia/libvdpau \
 		libhogweed.so:security/nettle
 
-BROKEN_armv6=		fails to compile: cc: warning: joined argument expects additional value: -mcpu=
-
 USES=		cpe gmake perl5 pkgconfig tar:xz
 USE_XORG=	x11
 HAS_CONFIGURE=	yes
@@ -226,10 +225,10 @@ post-configure-DOCS-off:
 	@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
 
 post-install:
-.for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\
-	lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\
-	lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\
-	lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0
+.for a in bin/avconv bin/avprobe lib/libav/libavcodec.so.57.25.0\
+	lib/libav/libavdevice.so.56.1.0 lib/libav/libavfilter.so.6.7.0\
+	lib/libav/libavformat.so.57.7.2 lib/libav/libavresample.so.3.0.0\
+	lib/libav/libavutil.so.55.20.0 lib/libav/libswscale.so.4.0.0
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a}
 .endfor
 
diff --git a/multimedia/libav/distinfo b/multimedia/libav/distinfo
index 58a381ccf1f3..96ec66294976 100644
--- a/multimedia/libav/distinfo
+++ b/multimedia/libav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486171185
-SHA256 (libav-11.8.tar.xz) = 7014b869570b9ea759e5c06beb3e9debd024a1c5af517655a9e1ccfe145baf4e
-SIZE (libav-11.8.tar.xz) = 4865796
+TIMESTAMP = 1495507159
+SHA256 (libav-12.1.tar.xz) = fad96aa265d3d64b9e53c159559621ec888effa022908da8372164fa4cbe5d2d
+SIZE (libav-12.1.tar.xz) = 5267292
diff --git a/multimedia/libav/files/patch-libavcodec-libilbc.c b/multimedia/libav/files/patch-libavcodec-libilbc.c
deleted file mode 100644
index 905f52b272b5..000000000000
--- a/multimedia/libav/files/patch-libavcodec-libilbc.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- libavcodec/libilbc.c.orig	2016-05-25 00:36:32 UTC
-+++ libavcodec/libilbc.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include <ilbc.h>
-+#include <stdint.h>
- 
- #include "libavutil/channel_layout.h"
- #include "libavutil/common.h"
-@@ -95,8 +96,8 @@ static int ilbc_decode_frame(AVCodecCont
-         return ret;
-     }
- 
--    WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
--                             (const WebRtc_UWord16*) buf, &s->decoder, 1);
-+    WebRtcIlbcfix_DecodeImpl((int16_t*) frame->data[0],
-+                             (const uint16_t*) buf, &s->decoder, 1);
- 
-     *got_frame_ptr = 1;
- 
-@@ -168,7 +169,7 @@ static int ilbc_encode_frame(AVCodecCont
-         return ret;
-     }
- 
--    WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder);
-+    WebRtcIlbcfix_EncodeImpl((uint16_t*) avpkt->data, (const int16_t*) frame->data[0], &s->encoder);
- 
-     avpkt->size     = s->encoder.no_of_bytes;
-     *got_packet_ptr = 1;
diff --git a/multimedia/libav/files/patch-libavcodec_libvpxenc.c b/multimedia/libav/files/patch-libavcodec_libvpxenc.c
deleted file mode 100644
index 95773fcb16af..000000000000
--- a/multimedia/libav/files/patch-libavcodec_libvpxenc.c
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 6540fe0
-Author: James Zern <jzern@google.com>
-Date:   Mon Oct 19 22:44:11 2015 -0700
-
-    libvpxenc: remove some unused ctrl id mappings
-    
-    VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
-    from libvpx and the remaining values were never used here
-    
-    Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
-    Signed-off-by: James Zern <jzern@google.com>
---- libavcodec/libvpxenc.c.orig	2016-05-25 00:36:32 UTC
-+++ libavcodec/libvpxenc.c
-@@ -70,19 +70,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",
diff --git a/multimedia/libav/pkg-plist b/multimedia/libav/pkg-plist
index 1354709fbba4..ea803344a30f 100644
--- a/multimedia/libav/pkg-plist
+++ b/multimedia/libav/pkg-plist
@@ -3,12 +3,16 @@ bin/avconv
 bin/avprobe
 include/libav/libavcodec/avcodec.h
 include/libav/libavcodec/avfft.h
+include/libav/libavcodec/d3d11va.h
+include/libav/libavcodec/dirac.h
 include/libav/libavcodec/dv_profile.h
 include/libav/libavcodec/dxva2.h
+include/libav/libavcodec/qsv.h
 include/libav/libavcodec/vaapi.h
 include/libav/libavcodec/vda.h
 include/libav/libavcodec/vdpau.h
 include/libav/libavcodec/version.h
+include/libav/libavcodec/vorbis_parser.h
 include/libav/libavcodec/xvmc.h
 include/libav/libavdevice/avdevice.h
 include/libav/libavdevice/version.h
@@ -26,7 +30,6 @@ include/libav/libavutil/adler32.h
 include/libav/libavutil/aes.h
 include/libav/libavutil/attributes.h
 include/libav/libavutil/audio_fifo.h
-include/libav/libavutil/audioconvert.h
 include/libav/libavutil/avassert.h
 include/libav/libavutil/avconfig.h
 include/libav/libavutil/avstring.h
@@ -48,6 +51,12 @@ include/libav/libavutil/fifo.h
 include/libav/libavutil/file.h
 include/libav/libavutil/frame.h
 include/libav/libavutil/hmac.h
+include/libav/libavutil/hwcontext.h
+include/libav/libavutil/hwcontext_cuda.h
+include/libav/libavutil/hwcontext_dxva2.h
+include/libav/libavutil/hwcontext_qsv.h
+include/libav/libavutil/hwcontext_vaapi.h
+include/libav/libavutil/hwcontext_vdpau.h
 include/libav/libavutil/imgutils.h
 include/libav/libavutil/intfloat.h
 include/libav/libavutil/intreadwrite.h
@@ -58,7 +67,6 @@ include/libav/libavutil/macros.h
 include/libav/libavutil/mathematics.h
 include/libav/libavutil/md5.h
 include/libav/libavutil/mem.h
-include/libav/libavutil/old_pix_fmts.h
 include/libav/libavutil/opt.h
 include/libav/libavutil/parseutils.h
 include/libav/libavutil/pixdesc.h
@@ -76,32 +84,32 @@ include/libav/libswscale/swscale.h
 include/libav/libswscale/version.h
 lib/libav/libavcodec.a
 lib/libav/libavcodec.so
-lib/libav/libavcodec.so.56
-lib/libav/libavcodec.so.56.1.0
+lib/libav/libavcodec.so.57
+lib/libav/libavcodec.so.57.25.0
 lib/libav/libavdevice.a
 lib/libav/libavdevice.so
-lib/libav/libavdevice.so.55
-lib/libav/libavdevice.so.55.0.0
+lib/libav/libavdevice.so.56
+lib/libav/libavdevice.so.56.1.0
 lib/libav/libavfilter.a
 lib/libav/libavfilter.so
-lib/libav/libavfilter.so.5
-lib/libav/libavfilter.so.5.0.0
+lib/libav/libavfilter.so.6
+lib/libav/libavfilter.so.6.7.0
 lib/libav/libavformat.a
 lib/libav/libavformat.so
-lib/libav/libavformat.so.56
-lib/libav/libavformat.so.56.1.0
+lib/libav/libavformat.so.57
+lib/libav/libavformat.so.57.7.2
 lib/libav/libavresample.a
 lib/libav/libavresample.so
-lib/libav/libavresample.so.2
-lib/libav/libavresample.so.2.1.0
+lib/libav/libavresample.so.3
+lib/libav/libavresample.so.3.0.0
 lib/libav/libavutil.a
 lib/libav/libavutil.so
-lib/libav/libavutil.so.54
-lib/libav/libavutil.so.54.3.0
+lib/libav/libavutil.so.55
+lib/libav/libavutil.so.55.20.0
 lib/libav/libswscale.a
 lib/libav/libswscale.so
-lib/libav/libswscale.so.3
-lib/libav/libswscale.so.3.0.0
+lib/libav/libswscale.so.4
+lib/libav/libswscale.so.4.0.0
 libdata/pkgconfig/libavcodec-libav.pc
 libdata/pkgconfig/libavdevice-libav.pc
 libdata/pkgconfig/libavfilter-libav.pc