ffmpeg4: updated to 4.2

version 4.2:
- tpad filter
- AV1 decoding support through libdav1d
- dedot filter
- chromashift and rgbashift filters
- freezedetect filter
- truehd_core bitstream filter
- dhav demuxer
- PCM-DVD encoder
- GIF parser
- vividas demuxer
- hymt decoder
- anlmdn filter
- maskfun filter
- hcom demuxer and decoder
- ARBC decoder
- libaribb24 based ARIB STD-B24 caption support (profiles A and C)
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
- removed libndi-newtek
- agm decoder
- KUX demuxer
- AV1 frame split bitstream filter
- lscr decoder
- lagfun filter
- asoftclip filter
- Support decoding of HEVC 4:4:4 content in vdpau
- colorhold filter
- xmedian filter
- asr filter
- showspatial multimedia filter
- VP4 video decoder
- IFV demuxer
- derain filter
- deesser filter
- mov muxer writes tracks with unspecified language instead of English by default
- add support for using clang to compile CUDA kernels

5 files changed, 21 insertions, 20 deletions

diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index 1a8981e3e73..9a4e4b99546 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2019/07/20 22:46:34 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/06 07:51:33 adam Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v4.x)
diff --git a/multimedia/ffmpeg4/Makefile.common b/multimedia/ffmpeg4/Makefile.common
index 4ff77d1c285..aa9675de4e1 100644
--- a/multimedia/ffmpeg4/Makefile.common
+++ b/multimedia/ffmpeg4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.14 2019/07/09 07:20:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.15 2019/08/06 07:51:33 adam Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
-DISTNAME=	ffmpeg-4.1.4
+DISTNAME=	ffmpeg-4.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/multimedia/ffmpeg4/PLIST b/multimedia/ffmpeg4/PLIST
index 623f52e571e..c59163721ac 100644
--- a/multimedia/ffmpeg4/PLIST
+++ b/multimedia/ffmpeg4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/11/06 19:31:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/08/06 07:51:33 adam Exp $
 bin/ffmpeg4
 bin/ffprobe4
 include/ffmpeg4/libavcodec/ac3_parser.h
@@ -62,6 +62,7 @@ include/ffmpeg4/libavutil/fifo.h
 include/ffmpeg4/libavutil/file.h
 include/ffmpeg4/libavutil/frame.h
 include/ffmpeg4/libavutil/hash.h
+include/ffmpeg4/libavutil/hdr_dynamic_metadata.h
 include/ffmpeg4/libavutil/hmac.h
 include/ffmpeg4/libavutil/hwcontext.h
 include/ffmpeg4/libavutil/hwcontext_cuda.h
@@ -108,6 +109,7 @@ include/ffmpeg4/libavutil/timecode.h
 include/ffmpeg4/libavutil/timestamp.h
 include/ffmpeg4/libavutil/tree.h
 include/ffmpeg4/libavutil/twofish.h
+include/ffmpeg4/libavutil/tx.h
 include/ffmpeg4/libavutil/version.h
 include/ffmpeg4/libavutil/xtea.h
 include/ffmpeg4/libpostproc/postprocess.h
@@ -119,19 +121,19 @@ include/ffmpeg4/libswscale/version.h
 lib/ffmpeg4/libavcodec.a
 lib/ffmpeg4/libavcodec.so
 lib/ffmpeg4/libavcodec.so.58
-lib/ffmpeg4/libavcodec.so.58.35.100
+lib/ffmpeg4/libavcodec.so.58.54.100
 lib/ffmpeg4/libavdevice.a
 lib/ffmpeg4/libavdevice.so
 lib/ffmpeg4/libavdevice.so.58
-lib/ffmpeg4/libavdevice.so.58.5.100
+lib/ffmpeg4/libavdevice.so.58.8.100
 lib/ffmpeg4/libavfilter.a
 lib/ffmpeg4/libavfilter.so
 lib/ffmpeg4/libavfilter.so.7
-lib/ffmpeg4/libavfilter.so.7.40.101
+lib/ffmpeg4/libavfilter.so.7.57.100
 lib/ffmpeg4/libavformat.a
 lib/ffmpeg4/libavformat.so
 lib/ffmpeg4/libavformat.so.58
-lib/ffmpeg4/libavformat.so.58.20.100
+lib/ffmpeg4/libavformat.so.58.29.100
 lib/ffmpeg4/libavresample.a
 lib/ffmpeg4/libavresample.so
 lib/ffmpeg4/libavresample.so.4
@@ -139,19 +141,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.22.100
+lib/ffmpeg4/libavutil.so.56.31.100
 lib/ffmpeg4/libpostproc.a
 lib/ffmpeg4/libpostproc.so
 lib/ffmpeg4/libpostproc.so.55
-lib/ffmpeg4/libpostproc.so.55.3.100
+lib/ffmpeg4/libpostproc.so.55.5.100
 lib/ffmpeg4/libswresample.a
 lib/ffmpeg4/libswresample.so
 lib/ffmpeg4/libswresample.so.3
-lib/ffmpeg4/libswresample.so.3.3.100
+lib/ffmpeg4/libswresample.so.3.5.100
 lib/ffmpeg4/libswscale.a
 lib/ffmpeg4/libswscale.so
 lib/ffmpeg4/libswscale.so.5
-lib/ffmpeg4/libswscale.so.5.3.100
+lib/ffmpeg4/libswscale.so.5.5.100
 lib/ffmpeg4/pkgconfig/libavcodec.pc
 lib/ffmpeg4/pkgconfig/libavdevice.pc
 lib/ffmpeg4/pkgconfig/libavfilter.pc
diff --git a/multimedia/ffmpeg4/buildlink3.mk b/multimedia/ffmpeg4/buildlink3.mk
index e5f34ffffe2..e95decf2d73 100644
--- a/multimedia/ffmpeg4/buildlink3.mk
+++ b/multimedia/ffmpeg4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/11/23 08:06:28 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2019/08/06 07:51:33 adam Exp $
 
 BUILDLINK_TREE+=	ffmpeg4
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ffmpeg4
 FFMPEG4_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ffmpeg4+=	ffmpeg4>=4.0
-BUILDLINK_ABI_DEPENDS.ffmpeg4+=	ffmpeg4>=4.1nb2
+BUILDLINK_ABI_DEPENDS.ffmpeg4+=	ffmpeg4>=4.2
 BUILDLINK_PKGSRCDIR.ffmpeg4?=	../../multimedia/ffmpeg4
 
 pkgbase := ffmpeg4
diff --git a/multimedia/ffmpeg4/distinfo b/multimedia/ffmpeg4/distinfo
index b0ef73553bc..044cd25ded8 100644
--- a/multimedia/ffmpeg4/distinfo
+++ b/multimedia/ffmpeg4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2019/07/09 07:20:33 adam Exp $
+$NetBSD: distinfo,v 1.11 2019/08/06 07:51:33 adam Exp $
 
-SHA1 (ffmpeg-4.1.4.tar.xz) = c4dc0e8efca38c03a98e3698279327fdaa767cc4
-RMD160 (ffmpeg-4.1.4.tar.xz) = 73f8e5f363a5803f6e11992f2c112a09e0abd04f
-SHA512 (ffmpeg-4.1.4.tar.xz) = 1d0c3c3e04d14094e98a8ea4274ea01b941a658afa501ff408a8b2ee146b997743d51b8863ae184e9590333a94297a0fa5c079a211739513cf7c8350d3bd64dd
-Size (ffmpeg-4.1.4.tar.xz) = 8896056 bytes
+SHA1 (ffmpeg-4.2.tar.xz) = 75d2af95c37402f29fc8432f5578e456e7366620
+RMD160 (ffmpeg-4.2.tar.xz) = f72555485c2cd2d23917f4a33ae17166bc1c1da3
+SHA512 (ffmpeg-4.2.tar.xz) = c1f6a86736c417790d7b88d687fdba28c620682a7247d8865062b90a9510b798a0230ab0bc993de85021fefb1044fa929a6c29c77d91b81c52873af569210313
+Size (ffmpeg-4.2.tar.xz) = 9088756 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
 SHA1 (patch-configure) = 5f9acc5a62fe20774e63e8f4d2367174104f2774
 SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc