Index: head/multimedia/svt-av1/Makefile =================================================================== --- head/multimedia/svt-av1/Makefile (revision 496401) +++ head/multimedia/svt-av1/Makefile (revision 496402) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= svt-av1 -PORTVERSION= s20180315 +PORTVERSION= s20180319 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 -GH_TAGNAME= 39aad81 +GH_TAGNAME= 97eff0c CMAKE_OFF= BUILD_TESTING # no useful tests yet post-patch: # Default CFLAGS are already set by USES=cmake @${REINPLACE_CMD} -i .flags -E -e 's/ -mavx//' \ -e 's/CMAKE_C_FLAGS "/&$${CMAKE_C_FLAGS} /' \ -e '/C_FLAGS_(RELEASE|DEBUG)/d' \ -e '/NASM_FLAGS_DEBUG/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -i .flags -e 's/-march=core-avx2/-mavx2/' \ - ${WRKSRC}/Source/Lib/ASM_AVX2/CMakeLists.txt \ + ${WRKSRC}/Source/Lib/Common/ASM_AVX2/CMakeLists.txt \ # Avoid lang/gcc* dependency @${REINPLACE_CMD} -i .gcc -e 's/gcc-//' \ -e '/CMAKE_C/{ s/STREQUAL/MATCHES/; s/"GNU/&|Clang/; }' \ ${WRKSRC}/CMakeLists.txt \ - ${WRKSRC}/Source/Lib/*/CMakeLists.txt + ${WRKSRC}/Source/Lib/Common/*/CMakeLists.txt # Avoid platform whitelists for generic non-Windows code @${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \ ${WRKSRC}/CMakeLists.txt \ - ${WRKSRC}/Source/Lib/*/CMakeLists.txt + ${WRKSRC}/Source/Lib/*/*/CMakeLists.txt @${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/' # Avoid -msse4.1 for (unused) function not under Source/Lib/ASM_SSE4_1/ @${REINPLACE_CMD} -e '/_sse4_1/,/}/d; /smmintrin\.h/d' \ - ${WRKSRC}/Source/Lib/Codec/EbInterPrediction.c + ${WRKSRC}/Source/Lib/Common/Codec/EbInterPrediction.c .include Index: head/multimedia/svt-av1/distinfo =================================================================== --- head/multimedia/svt-av1/distinfo (revision 496401) +++ head/multimedia/svt-av1/distinfo (revision 496402) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552697376 -SHA256 (OpenVisualCloud-SVT-AV1-s20180315-39aad81_GH0.tar.gz) = c916fdc6087280c4e71640dc9954e0160fe8ae1f97b5f80256bf11e2e3583ff4 -SIZE (OpenVisualCloud-SVT-AV1-s20180315-39aad81_GH0.tar.gz) = 2125119 +TIMESTAMP = 1553062221 +SHA256 (OpenVisualCloud-SVT-AV1-s20180319-97eff0c_GH0.tar.gz) = 25d7e0e0076d19d1caa713f1d9a43122791856eef59e5e3cedc1b6f715f1cdac +SIZE (OpenVisualCloud-SVT-AV1-s20180319-97eff0c_GH0.tar.gz) = 2190691 Index: head/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h =================================================================== --- head/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h (revision 496401) +++ head/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h (revision 496402) @@ -1,24 +1,24 @@ 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-02-14 00:36:54 UTC -+++ Source/Lib/Codec/EbThreads.h +--- Source/Lib/Common/Codec/EbThreads.h.orig 2019-02-14 00:36:54 UTC ++++ Source/Lib/Common/Codec/EbThreads.h @@ -95,7 +95,14 @@ extern EB_BOOL alternateGroups; #else #define __USE_GNU #define _GNU_SOURCE +#ifdef __FreeBSD__ +#define cpu_set_t cpuset_t +#else #include +#endif #include +#if defined(__DragonFly__) || defined(__FreeBSD__) +#include +#endif extern cpu_set_t groupAffinity; #define EB_CREATETHREAD(type, pointer, nElements, pointerClass, threadFunction, threadContext) \ Index: head/multimedia/svt-av1/pkg-plist =================================================================== --- head/multimedia/svt-av1/pkg-plist (revision 496401) +++ head/multimedia/svt-av1/pkg-plist (revision 496402) @@ -1,11 +1,14 @@ +bin/SvtAv1DecApp bin/SvtAv1EncApp bin/SvtAv1EncSimpleApp include/svt-av1/EbSvtAv1.h include/svt-av1/EbSvtAv1Dec.h include/svt-av1/EbSvtAv1Enc.h include/svt-av1/EbSvtAv1ErrorCodes.h include/svt-av1/EbSvtAv1ExtFrameBuf.h include/svt-av1/EbSvtAv1Formats.h include/svt-av1/EbSvtAv1Time.h +lib/libSvtAv1Dec.so lib/libSvtAv1Enc.so +libdata/pkgconfig/SvtAv1Dec.pc libdata/pkgconfig/SvtAv1Enc.pc