Index: head/multimedia/svt-hevc/Makefile =================================================================== --- head/multimedia/svt-hevc/Makefile (revision 493740) +++ head/multimedia/svt-hevc/Makefile (revision 493741) @@ -1,53 +1,57 @@ # $FreeBSD$ PORTNAME= svt-hevc DISTVERSIONPREFIX= v PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= multimedia + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= ad0942db4ce4.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Scalable HEVC 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= Intel GH_PROJECT= SVT-HEVC post-patch: # Default CFLAGS are already set by USES=cmake @${REINPLACE_CMD} -i .flags -E -e 's/ -march=native//' \ -e 's/-O2 -flto //' \ -e '/C_FLAGS_(RELEASE|DEBUG)/d' \ -e '/NASM_FLAGS_DEBUG/d' \ ${WRKSRC}/CMakeLists.txt # Avoid devel/yasm dependency @${REINPLACE_CMD} -i .typo 's/MAKE_ASM_NASM_COMPILER/s&/' \ ${WRKSRC}/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 # 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 @${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \ ${WRKSRC}/CMakeLists.txt \ ${WRKSRC}/Source/Lib/*/CMakeLists.txt @${GREP} -Flr '__linux' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/' .include Index: head/multimedia/svt-hevc/distinfo =================================================================== --- head/multimedia/svt-hevc/distinfo (revision 493740) +++ head/multimedia/svt-hevc/distinfo (revision 493741) @@ -1,3 +1,5 @@ TIMESTAMP = 1550104614 SHA256 (Intel-SVT-HEVC-v1.3.0_GH0.tar.gz) = ef21f3a13e33b4f61af4a0c79337ce9e4f73f6fe13d1c2afe2c3b0712f4158d9 SIZE (Intel-SVT-HEVC-v1.3.0_GH0.tar.gz) = 1137878 +SHA256 (ad0942db4ce4.patch) = 2165f1b1d658dbbac91f8a2e86976f6692f93fcc6649feacbc6013d811874f48 +SIZE (ad0942db4ce4.patch) = 864 Index: head/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h =================================================================== --- head/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h (revision 493740) +++ head/multimedia/svt-hevc/files/patch-Source_Lib_Codec_EbThreads.h (revision 493741) @@ -1,24 +1,24 @@ -FreeBSD (unlike DragonFly) didn't try to be compatible with GNU libc at first. - 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 -@@ -95,7 +95,12 @@ extern EB_BOOL alternateGroups; +@@ -95,7 +95,14 @@ extern EB_BOOL alternateGroups; #else #define __USE_GNU #define _GNU_SOURCE +#ifdef __FreeBSD__ -+#include +#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) \