ffmpeg4/ffplay4: updated to 4.1

version 4.1:
- deblock filter
- tmix filter
- amplify filter
- fftdnoiz filter
- aderivative and aintegral audio filters
- pal75bars and pal100bars video filter sources
- support mbedTLS based TLS
- adeclick filter
- adeclip filter
- libtensorflow backend for DNN based filters like srcnn
- vc1 decoder is now bit-exact
- ATRAC9 decoder
- lensfun wrapper filter
- colorconstancy filter
- AVS2 video decoder via libdavs2
- IMM4 video decoder
- Brooktree ProSumer video decoder
- MatchWare Screen Capture Codec decoder
- WinCam Motion Video decoder
- 1D LUT filter (lut1d)
- RemotelyAnywhere Screen Capture decoder
- cue and acue filters
- support for AV1 in MP4
- transpose_npp filter
- AVS2 video encoder via libxavs2
- amultiply filter
- Block-Matching 3d (bm3d) denoising filter
- acrossover filter
- ilbc decoder
- audio denoiser as afftdn filter
- AV1 parser
- SER demuxer
- sinc audio filter source
- chromahold filter
- setparams filter
- vibrance filter
- decoding S12M timecode in h264
- xstack filter
- pcm vidc decoder and encoder
- (a)graphmonitor filter
- yadif_cuda filter

4 files changed, 37 insertions, 24 deletions

diff --git a/multimedia/ffmpeg4/Makefile.common b/multimedia/ffmpeg4/Makefile.common
index abaf6262ebd..52fc1491c1a 100644
--- a/multimedia/ffmpeg4/Makefile.common
+++ b/multimedia/ffmpeg4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2018/11/03 07:44:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2018/11/06 19:31:09 adam Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
-DISTNAME=	ffmpeg-4.0.3
+DISTNAME=	ffmpeg-4.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/multimedia/ffmpeg4/PLIST b/multimedia/ffmpeg4/PLIST
index 60e7a2d2f92..623f52e571e 100644
--- a/multimedia/ffmpeg4/PLIST
+++ b/multimedia/ffmpeg4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/11/03 11:31:35 maya Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/11/06 19:31:09 adam Exp $
 bin/ffmpeg4
 bin/ffprobe4
 include/ffmpeg4/libavcodec/ac3_parser.h
@@ -119,19 +119,19 @@ include/ffmpeg4/libswscale/version.h
 lib/ffmpeg4/libavcodec.a
 lib/ffmpeg4/libavcodec.so
 lib/ffmpeg4/libavcodec.so.58
-lib/ffmpeg4/libavcodec.so.58.18.100
+lib/ffmpeg4/libavcodec.so.58.35.100
 lib/ffmpeg4/libavdevice.a
 lib/ffmpeg4/libavdevice.so
 lib/ffmpeg4/libavdevice.so.58
-lib/ffmpeg4/libavdevice.so.58.3.100
+lib/ffmpeg4/libavdevice.so.58.5.100
 lib/ffmpeg4/libavfilter.a
 lib/ffmpeg4/libavfilter.so
 lib/ffmpeg4/libavfilter.so.7
-lib/ffmpeg4/libavfilter.so.7.16.100
+lib/ffmpeg4/libavfilter.so.7.40.101
 lib/ffmpeg4/libavformat.a
 lib/ffmpeg4/libavformat.so
 lib/ffmpeg4/libavformat.so.58
-lib/ffmpeg4/libavformat.so.58.12.100
+lib/ffmpeg4/libavformat.so.58.20.100
 lib/ffmpeg4/libavresample.a
 lib/ffmpeg4/libavresample.so
 lib/ffmpeg4/libavresample.so.4
@@ -139,19 +139,19 @@ lib/ffmpeg4/libavresample.so.4.0.0
 lib/ffmpeg4/libavutil.a
 lib/ffmpeg4/libavutil.so
 lib/ffmpeg4/libavutil.so.56
-lib/ffmpeg4/libavutil.so.56.14.100
+lib/ffmpeg4/libavutil.so.56.22.100
 lib/ffmpeg4/libpostproc.a
 lib/ffmpeg4/libpostproc.so
 lib/ffmpeg4/libpostproc.so.55
-lib/ffmpeg4/libpostproc.so.55.1.100
+lib/ffmpeg4/libpostproc.so.55.3.100
 lib/ffmpeg4/libswresample.a
 lib/ffmpeg4/libswresample.so
 lib/ffmpeg4/libswresample.so.3
-lib/ffmpeg4/libswresample.so.3.1.100
+lib/ffmpeg4/libswresample.so.3.3.100
 lib/ffmpeg4/libswscale.a
 lib/ffmpeg4/libswscale.so
 lib/ffmpeg4/libswscale.so.5
-lib/ffmpeg4/libswscale.so.5.1.100
+lib/ffmpeg4/libswscale.so.5.3.100
 lib/ffmpeg4/pkgconfig/libavcodec.pc
 lib/ffmpeg4/pkgconfig/libavdevice.pc
 lib/ffmpeg4/pkgconfig/libavfilter.pc
diff --git a/multimedia/ffmpeg4/distinfo b/multimedia/ffmpeg4/distinfo
index 1ea15a8325d..d82106e5003 100644
--- a/multimedia/ffmpeg4/distinfo
+++ b/multimedia/ffmpeg4/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2018/11/03 07:44:35 adam Exp $
+$NetBSD: distinfo,v 1.6 2018/11/06 19:31:09 adam Exp $
 
-SHA1 (ffmpeg-4.0.3.tar.xz) = 3960ff0cc86e857d6245a89a17b646b025fe43fd
-RMD160 (ffmpeg-4.0.3.tar.xz) = 7eebedb9e0bb3c961f07c85bec66a624e2f79477
-SHA512 (ffmpeg-4.0.3.tar.xz) = d980023df2013d5bf8b55767854f8ed9cc78cdd5e3b66cf0b680bf2da4a49a0174ac2f6b6ca937171221e8d3233d59814437c22f5f4c598b4c969fe82d573c39
-Size (ffmpeg-4.0.3.tar.xz) = 8668388 bytes
+SHA1 (ffmpeg-4.1.tar.xz) = 40bb9002df044514723e9cca7f0a049eee88fed8
+RMD160 (ffmpeg-4.1.tar.xz) = 04a511df8a1bedc3baf51c3601414ce78d7a71a9
+SHA512 (ffmpeg-4.1.tar.xz) = 59db7e8a6238048c04c3b0bd5885aea2bf7951f79949fc0659a8d235c4cd809ac0c1a74544a4c218a38c8c739eea76f5ee1231bfb96439487212c6e65591780e
+Size (ffmpeg-4.1.tar.xz) = 8890608 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = 47ac93aad164856f1af0460bd7c42df8efc5a3f6
+SHA1 (patch-configure) = 5f9acc5a62fe20774e63e8f4d2367174104f2774
 SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc
 SHA1 (patch-libavformat_sctp.c) = 22bad9c7dc152aec3c60e0009899af241f495535
 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
diff --git a/multimedia/ffmpeg4/patches/patch-configure b/multimedia/ffmpeg4/patches/patch-configure
index a6fb77ef993..de4904bf62e 100644
--- a/multimedia/ffmpeg4/patches/patch-configure
+++ b/multimedia/ffmpeg4/patches/patch-configure
@@ -1,11 +1,12 @@
-$NetBSD: patch-configure,v 1.2 2018/05/27 16:28:12 tsutsui Exp $
+$NetBSD: patch-configure,v 1.3 2018/11/06 19:31:09 adam Exp $
 
 Enable PIC on NetBSD, even on i386 to avoid text relocations.
 Do not use 'rsync'.
+Portability fixes.
 
---- configure.orig	2018-04-20 10:02:55.000000000 +0000
+--- configure.orig	2018-11-05 23:22:33.000000000 +0000
 +++ configure
-@@ -2165,7 +2165,6 @@ TOOLCHAIN_FEATURES="
+@@ -2203,7 +2203,6 @@ TOOLCHAIN_FEATURES="
      inline_asm_labels
      inline_asm_nonlocal_labels
      pragma_deprecated
@@ -13,7 +14,19 @@ Do not use 'rsync'.
      symver_asm_label
      symver_gnu_asm
      vfp_args
-@@ -5043,6 +5042,7 @@ case $target_os in
+@@ -4844,9 +4843,9 @@ elif enabled mips; then
+                 disable mipsdsp
+                 disable mipsdspr2
+                 # When gcc version less than 5.3.0, add -fno-expensive-optimizations flag.
+-                if [ $cc == gcc ]; then
++                if [ $cc = gcc ]; then
+                     gcc_version=$(gcc -dumpversion)
+-                    if [ "$(echo "$gcc_version 5.3.0" | tr " " "\n" | sort -rV | head -n 1)" == "$gcc_version" ]; then
++                    if [ "$(echo "$gcc_version 5.3.0" | tr " " "\n" | sort -rV | head -n 1)" = "$gcc_version" ]; then
+                         expensive_optimization_flag=""
+                     else
+                         expensive_optimization_flag="-fno-expensive-optimizations"
+@@ -5140,6 +5139,7 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -21,7 +34,7 @@ Do not use 'rsync'.
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5429,10 +5429,13 @@ done
+@@ -5526,10 +5526,13 @@ done
  check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
  
  # The global variable ensures the bits appear unchanged in the object file.
@@ -38,11 +51,11 @@ Do not use 'rsync'.
  
  check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
  
-@@ -6190,7 +6193,6 @@ enabled makeinfo \
+@@ -6299,7 +6302,6 @@ enabled makeinfo \
  disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
  perl -v            > /dev/null 2>&1 && enable perl      || disable perl
  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
 -rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
  
  # check V4L2 codecs available in the API
- check_header linux/fb.h
+ check_headers linux/fb.h