7 files changed, 11 insertions, 43 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 322044fd2e19..c15ded6368b2 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -464,7 +464,7 @@ SVTAV1_PREVENTS_MSG=	Only one SVT vendor patch can be applied at the same time
 # svt-hevc
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
-SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.1/ffmpeg_plugin/:svthevc
+SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.2/ffmpeg_plugin/:svthevc
 SVTHEVC_PATCHFILES=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
 			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 2d04888d0924..566b7236276a 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -3,8 +3,8 @@ SHA256 (ffmpeg-4.2.1.tar.xz) = cec7c87e9b60d174509e263ac4011b522385fd0775292e167
 SIZE (ffmpeg-4.2.1.tar.xz) = 9090632
 SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 2bc5ef5d56c2f3982dfeb17fd641aca5bdbfdce2697dfe14a3ea094686dbfb04
 SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 22982
-SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = d2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883
-SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 21806
+SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 7e7bdf5f74a6bdac7516b348cf99e0b44d5837a5de168d930acb3d4f1f2b8eb5
+SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 21893
 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
 SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
 SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = d2abcdcbcbff21e7ad8de574230622be993da19e9bddf0a690b1118cfd11c6c1
diff --git a/multimedia/gstreamer1-plugins-svt-hevc/Makefile b/multimedia/gstreamer1-plugins-svt-hevc/Makefile
index cf8be47ba188..9883d644b6f9 100644
--- a/multimedia/gstreamer1-plugins-svt-hevc/Makefile
+++ b/multimedia/gstreamer1-plugins-svt-hevc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	svt-hevc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.1
+DISTVERSION=	1.4.2
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	gstreamer1-plugins-
 
diff --git a/multimedia/gstreamer1-plugins-svt-hevc/distinfo b/multimedia/gstreamer1-plugins-svt-hevc/distinfo
index b6ac267f21d3..efac4f8d503e 100644
--- a/multimedia/gstreamer1-plugins-svt-hevc/distinfo
+++ b/multimedia/gstreamer1-plugins-svt-hevc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567986865
-SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 8ceb14acddd0af48e87deb17dc0a54fc9f82c50d6e0b392076fa8f7d0533f74b
-SIZE (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 1221678
+TIMESTAMP = 1575900272
+SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.2_GH0.tar.gz) = 2c07a7ad8bb9a81fe85421dad472f1cafd664a5be19467015b8221f53aed2b1d
+SIZE (OpenVisualCloud-SVT-HEVC-v1.4.2_GH0.tar.gz) = 1229109
diff --git a/multimedia/svt-hevc/Makefile b/multimedia/svt-hevc/Makefile
index 31c83773c9e6..f1324da63ff5 100644
--- a/multimedia/svt-hevc/Makefile
+++ b/multimedia/svt-hevc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	svt-hevc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.1
+DISTVERSION=	1.4.2
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -26,18 +26,11 @@ GH_ACCOUNT=	OpenVisualCloud
 GH_PROJECT=	SVT-HEVC
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	NATIVE
-CFLAGS+=	-D__STDC_WANT_LIB_EXT1__=0
 
 post-patch:
 # Keep using nasm and drop vendor -O/-g
 	@${REINPLACE_CMD} -e '/find_program.*yasm/d' \
 		-Ee '/set.*(release|debug)_flags_to_test/,/\)/d' \
 		${WRKSRC}/CMakeLists.txt
-# Avoid conflict with standard types
-	@${GREP} -Flr '_T_DEFINED' ${WRKSRC} | ${XARGS} \
-		${REINPLACE_CMD} -i .types 's/_T_DEFINED/_DEFINED/'
-# Avoid platform whitelists for generic non-Windows code
-	@${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
-		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__unix__/'
 
 .include <bsd.port.mk>
diff --git a/multimedia/svt-hevc/distinfo b/multimedia/svt-hevc/distinfo
index b6ac267f21d3..efac4f8d503e 100644
--- a/multimedia/svt-hevc/distinfo
+++ b/multimedia/svt-hevc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567986865
-SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 8ceb14acddd0af48e87deb17dc0a54fc9f82c50d6e0b392076fa8f7d0533f74b
-SIZE (OpenVisualCloud-SVT-HEVC-v1.4.1_GH0.tar.gz) = 1221678
+TIMESTAMP = 1575900272
+SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.2_GH0.tar.gz) = 2c07a7ad8bb9a81fe85421dad472f1cafd664a5be19467015b8221f53aed2b1d
+SIZE (OpenVisualCloud-SVT-HEVC-v1.4.2_GH0.tar.gz) = 1229109
diff --git a/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h b/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h
deleted file mode 100644
index 4e3f5a3dcc60..000000000000
--- a/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h
+++ /dev/null
@@ -1,25 +0,0 @@
-In file included from Source/Lib/Codec/EbEncDecProcess.c:9:
-In file included from Source/Lib/Codec/EbTransforms.h:14:
-In file included from Source/Lib/Codec/EbSequenceControlSet.h:10:
-Source/Lib/Codec/EbThreads.h:100:11: error: unknown type name 'cpu_set_t'
-extern    cpu_set_t                   groupAffinity;
-          ^
-
---- Source/Lib/Codec/EbThreads.h.orig	2019-09-08 23:54:25 UTC
-+++ Source/Lib/Codec/EbThreads.h
-@@ -97,8 +97,15 @@ extern    EB_BOOL                  alternateGroups;
- #define __USE_GNU
- #define _GNU_SOURCE
- #endif
-+#ifdef __FreeBSD__
-+#define cpu_set_t cpuset_t
-+#else
- #include <sched.h>
-+#endif
- #include <pthread.h>
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <pthread_np.h>
-+#endif
- extern    cpu_set_t                   groupAffinity;
- #define EB_CREATETHREAD(type, pointer, nElements, pointerClass, threadFunction, threadContext) \
-     pointer = EbCreateThread(threadFunction, threadContext); \