Index: head/multimedia/svt-av1/Makefile
===================================================================
--- head/multimedia/svt-av1/Makefile	(revision 512300)
+++ head/multimedia/svt-av1/Makefile	(revision 512301)
@@ -1,41 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	svt-av1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0-346
-DISTVERSIONSUFFIX=	-g4f180cce
+DISTVERSION=	0.6.0-358
+DISTVERSIONSUFFIX=	-g48c155aa
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Scalable AV1 encoder
 
 LICENSE=	BSD2CLAUSE+PATENT
 LICENSE_GROUPS=	FSF OSI COPYFREE
 LICENSE_NAME=	BSD-2-Clause Plus Patent License
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	uses x86-64 assembly
 
 BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		cmake compiler:c11
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	OpenVisualCloud
 GH_PROJECT=	SVT-AV1
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	NATIVE
 
 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 platform whitelists for generic non-Windows code
 # https://github.com/OpenVisualCloud/SVT-AV1/pull/162
 	@${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__unix__/'
 
 .include <bsd.port.mk>
Index: head/multimedia/svt-av1/distinfo
===================================================================
--- head/multimedia/svt-av1/distinfo	(revision 512300)
+++ head/multimedia/svt-av1/distinfo	(revision 512301)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568415415
-SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-346-g4f180cce_GH0.tar.gz) = 68e5e1ad8eb36a8c59a81be5f47371ba3dd6a2b7f6fcd425e171ce57bfdef45c
-SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-346-g4f180cce_GH0.tar.gz) = 2841990
+TIMESTAMP = 1568842406
+SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-358-g48c155aa_GH0.tar.gz) = 97e0c00e6150ea8e5e007540cc8d14ad010101082871f996116a52ab95d3e0e0
+SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-358-g48c155aa_GH0.tar.gz) = 2857686
Index: head/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h
===================================================================
--- head/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h	(revision 512300)
+++ head/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h	(revision 512301)
@@ -1,24 +1,25 @@
 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/Common/Codec/EbThreads.h.orig	2019-02-14 00:36:54 UTC
+--- Source/Lib/Common/Codec/EbThreads.h.orig	2019-09-18 21:33:26 UTC
 +++ Source/Lib/Common/Codec/EbThreads.h
-@@ -95,7 +95,14 @@ extern    EB_BOOL                  alternateGroups;
- #else
- #define __USE_GNU
+@@ -99,8 +99,15 @@ extern "C" {
+ #ifndef _GNU_SOURCE
  #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) \
+ extern    cpu_set_t                   group_affinity;
+ #define EB_CREATE_THREAD(pointer, thread_function, thread_context) \
+     do { \