Attachment #245810 for bug #274526




PORTNAME=	x265
DISTVERSION=	3.5
PORTREVISION=	2
CATEGORIES=	multimedia
MASTER_SITES=	https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/

PATCH_SITES=	https://bitbucket.org/multicoreware/x265_git/commits/8f18e3ad32684eee95e885e718655f93951128c3/raw/
PATCHFILES+=	x265-asm-warnings.patch:-p1

MAINTAINER=	mi@aldan.algebra.com
COMMENT=	H.265/High Efficiency Video Coding (HEVC) format
WWW=		https://www.x265.org/


USES=		cmake compiler:c++14-lang cpe pathfix dos2unix

CPE_VENDOR=	multicorewareinc

BB_TAG=		Release_${DISTVERSION}

OPTIONS_DEFINE=		DEBUG OPTIMIZED_FLAGS VMAF
OPTIONS_DEFAULT=	OPTIMIZED_FLAGS HI8P HI10P HI12P

OPTIONS_MULTI=		PixelWidth
OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P

DOS2UNIX_FILES=		common/scaler.cpp
DEBUG_PREVENTS=		OPTIMIZED_FLAGS
DEBUG_PREVENTS_MSG=	Optimizations are incompatible with debugging code
DEBUG_CMAKE_ON=		-DCMAKE_ASM_NASM_FLAGS:STRING="-g -O0"

VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
VMAF_USES=		localbase:ldflags
VMAF_CMAKE_BOOL=	ENABLE_LIBVMAF
VMAF_CMAKE_ON=		-DVMAF_INCLUDE_DIR:PATH="${LOCALBASE}/include/libvmaf"

DEBUG_DESC=	Enable debugging
HI8P_DESC=	Enable 8-bit pixel-width (you, probably, want this)

USE_LDCONFIG=	yes
CMAKE_ARGS=	-DENABLE_TESTS=on -DENABLE_HDR10_PLUS:BOOL=true
LDFLAGS_i386=	-Wl,-znotext
EXTRACT_AFTER_ARGS+=	--exclude compat --exclude md5\.* --strip-components=1
PATCH_WRKSRC=	${WRKSRC:H}
WRKSRC=		${WRKDIR}/source


Lines 1-3 Link Here

(-)b/multimedia/x265/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1600662771	1	TIMESTAMP = 1698027802
2	SHA256 (x265-3.4.tar.gz) = 01f17d94689ef79807fa2b4bd7f5f58bb18416e72a135c7f56c30162a980cfb8	2	SHA256 (x265-3.5.tar.gz) = 8a5fcfddb3e2db520b637e475a507fb00117d554bdb3204c5828626d888c306a
3	SIZE (x265-3.4.tar.gz) = 1532396	3	SIZE (x265-3.5.tar.gz) = 1538610
		4	SHA256 (x265-asm-warnings.patch) = 0faa3278887a47ed8c968c994e4cc71a2921aac38f5d560dae898124f806871d
		5	SIZE (x265-asm-warnings.patch) = 4526




--- source/CMakeLists.txt	2023-10-22 22:08:10.704150000 -0400
+++ source/CMakeLists.txt	2023-10-22 22:10:02.947579000 -0400
@@ -43,7 +43,7 @@
 set(ARM_ALIASES armv6l armv7l aarch64)
 list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
 list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)

 list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
 if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
     set(X86 1)
@@ -122,6 +122,7 @@
     option(ENABLE_LIBVMAF "Enable VMAF" OFF)
     if(ENABLE_LIBVMAF)
         add_definitions(-DENABLE_LIBVMAF)

     endif()
 endif(UNIX)
 
@@ -593,12 +594,6 @@
         ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
 endif()
 

 install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
 if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
     if(MSVC_IDE)
@@ -650,7 +645,10 @@
     if(EXTRA_LIB)
         target_link_libraries(x265-shared ${EXTRA_LIB})
     endif()

Lines 1-6 Link Here

(-)b/multimedia/x265/files/patch-source_cmake_Findsvthevc.cmake (-3 / +5 lines)
1	--- source/cmake/Findsvthevc.cmake 2020-05-29 17:39:35.000000000 +0000	1	--- source/cmake/Findsvthevc.cmake.orig 2023-05-08 09:43:31 UTC
2	+++ source/cmake/Findsvthevc.cmake 2020-08-07 02:26:55.307048000 +0000	2	+++ source/cmake/Findsvthevc.cmake
3	@@ -39,9 +39,5 @@	3	@@ -38,11 +38,7 @@ if(SVT_HEVC_INCLUDE_DIR)
		4	string(REGEX MATCH "SVT_VERSION_PATCHLEVEL \$([0-9]*)\$" _ ${version})
4	set(SVT_VERSION_PATCHLEVEL ${CMAKE_MATCH_1})	5	set(SVT_VERSION_PATCHLEVEL ${CMAKE_MATCH_1})
5		6
6	- if(NOT ${SVT_VERSION_MAJOR} EQUAL "1" OR NOT ${SVT_VERSION_MINOR} EQUAL "4" OR NOT ${SVT_VERSION_PATCHLEVEL} EQUAL "1")	7	- if(NOT ${SVT_VERSION_MAJOR} EQUAL "1" OR NOT ${SVT_VERSION_MINOR} EQUAL "4" OR NOT ${SVT_VERSION_PATCHLEVEL} EQUAL "1")
Lines 11-13 Link Here
11	+ message(STATUS "-- Found SVT-HEVC Lib Version: ${SVT_VERSION_MAJOR}.${SVT_VERSION_MINOR}.${SVT_VERSION_PATCHLEVEL}")	12	+ message(STATUS "-- Found SVT-HEVC Lib Version: ${SVT_VERSION_MAJOR}.${SVT_VERSION_MINOR}.${SVT_VERSION_PATCHLEVEL}")
12	else()	13	else()
13	message (SEND_ERROR "-- Required version of SVT-HEVC Lib: ${SVT_VERSION_MAJOR_REQUIRED}.${SVT_VERSION_MINOR_REQUIRED}.${SVT_VERSION_PATCHLEVEL_REQUIRED}; Aborting configure ")	14	message (SEND_ERROR "-- Required version of SVT-HEVC Lib: ${SVT_VERSION_MAJOR_REQUIRED}.${SVT_VERSION_MINOR_REQUIRED}.${SVT_VERSION_PATCHLEVEL_REQUIRED}; Aborting configure ")
		15	endif()




--- source/common/version.cpp.orig	2023-06-27 14:11:49 UTC
+++ source/common/version.cpp
@@ -63,6 +63,8 @@
 #define ONOS    "[Linux]"

 #elif  __CYGWIN__
 #define ONOS    "[Cygwin]"
 #elif __APPLE__
@@ -71,7 +73,7 @@
 #define ONOS    "[Unk-OS]"
 #endif
 
-#if X86_64
+#if defined(X86_64) || X265_ARCH_ARM64
 #define BITS    "[64 bit]"
 #else
 #define BITS    "[32 bit]"

Lines 8-16 See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248479 Link Here

(-)b/multimedia/x265/files/patch-source_encoder_api.cpp (-6 / +13 lines)
8		8
9	-mi	9	-mi
10		10
11	--- source/encoder/api.cpp 2020-05-29 13:39:35.000000000 -0400	11	--- source/encoder/api.cpp.orig 2023-06-27 14:11:49 UTC
12	+++ source/encoder/api.cpp 2020-08-06 22:51:30.227635000 -0400	12	+++ source/encoder/api.cpp
13	@@ -451,5 +451,7 @@	13	@@ -449,14 +449,18 @@ int x265_encoder_encode(x265_encoder enc, x265_nal *
		14
14	if (pic_in->rpu.payloadSize)	15	if (pic_in->rpu.payloadSize)
15	{	16	{
16	+#if ! SVT_CHECK_VERSION(1, 5, 0)	17	+#if ! SVT_CHECK_VERSION(1, 5, 0)
Lines 18-24 See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248479 Link Here
18	+#endif	19	+#endif
19	memcpy(inputData->dolbyVisionRpu.payload, pic_in->rpu.payload, pic_in->rpu.payloadSize);	20	memcpy(inputData->dolbyVisionRpu.payload, pic_in->rpu.payload, pic_in->rpu.payloadSize);
20	inputData->dolbyVisionRpu.payloadSize = pic_in->rpu.payloadSize;	21	inputData->dolbyVisionRpu.payloadSize = pic_in->rpu.payloadSize;
21	@@ -458,5 +460,7 @@	22	inputData->dolbyVisionRpu.payloadType = NAL_UNIT_UNSPECIFIED;
		23	}
22	else	24	else
23	{	25	{
24	+#if ! SVT_CHECK_VERSION(1, 5, 0)	26	+#if ! SVT_CHECK_VERSION(1, 5, 0)
Lines 26-32 See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248479 Link Here
26	+#endif	28	+#endif
27	inputData->dolbyVisionRpu.payloadSize = 0;	29	inputData->dolbyVisionRpu.payloadSize = 0;
28	}	30	}
29	@@ -696,5 +700,7 @@	31
		32	@@ -702,7 +706,9 @@ void x265_encoder_close(x265_encoder *enc)
		33
30	svt_print_summary(enc);	34	svt_print_summary(enc);
31	EB_H265_ENC_INPUT inputData = (EB_H265_ENC_INPUT)encoder->m_svtAppData->inputPictureBuffer->pBuffer;	35	EB_H265_ENC_INPUT inputData = (EB_H265_ENC_INPUT)encoder->m_svtAppData->inputPictureBuffer->pBuffer;
32	+#if ! SVT_CHECK_VERSION(1, 5, 0)	36	+#if ! SVT_CHECK_VERSION(1, 5, 0)
Lines 34-40 See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248479 Link Here
34	+#endif	38	+#endif
35		39
36	X265_FREE(inputData);	40	X265_FREE(inputData);
37	@@ -2052,5 +2058,7 @@	41	X265_FREE(encoder->m_svtAppData->inputPictureBuffer);
		42	@@ -2063,7 +2069,9 @@ int svt_initialise_input_buffer(x265_encoder *enc)
		43	inputPtr->pBuffer = (unsigned char*)x265_malloc(sizeof(EB_H265_ENC_INPUT));
38		44
39	EB_H265_ENC_INPUT inputData = (EB_H265_ENC_INPUT)inputPtr->pBuffer;	45	EB_H265_ENC_INPUT inputData = (EB_H265_ENC_INPUT)inputPtr->pBuffer;
40	+#if ! SVT_CHECK_VERSION(1, 5, 0)	46	+#if ! SVT_CHECK_VERSION(1, 5, 0)
Lines 42-44 See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=248479 Link Here
42	+#endif	48	+#endif
43	inputData->dolbyVisionRpu.payloadSize = 0;	49	inputData->dolbyVisionRpu.payloadSize = 0;
44		50
		51




https://github.com/Netflix/vmaf/commit/122089fa3d23

--- source/x265.h.orig	2023-06-27 14:11:49 UTC
+++ source/x265.h
@@ -753,7 +753,7 @@ typedef struct x265_vmaf_commondata
     int enable_conf_interval;
 }x265_vmaf_commondata;
 
-static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } };
+static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.json", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } };
 
 typedef struct x265_temporal_layer {
     int poc_offset;      /* POC offset */

Lines 6-10 lib/libhdr10plus.a Link Here

(-)b/multimedia/x265/pkg-plist (-1 / +1 lines)
6	lib/libhdr10plus.so	6	lib/libhdr10plus.so
7	lib/libx265.a	7	lib/libx265.a
8	lib/libx265.so	8	lib/libx265.so
9	lib/libx265.so.192	9	lib/libx265.so.200
10	libdata/pkgconfig/x265.pc	10	libdata/pkgconfig/x265.pc

Return to bug 274526

Lines 1-9 Link Here

(-)b/multimedia/x265/Makefile (-7 / +9 lines)
1	PORTNAME= x265	1	PORTNAME= x265
2	PORTVERSION= 3.4	2	DISTVERSION= 3.5
3	PORTREVISION= 2
4	CATEGORIES= multimedia	3	CATEGORIES= multimedia
5	MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/	4	MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/
6		5
		6	PATCH_SITES= https://bitbucket.org/multicoreware/x265_git/commits/8f18e3ad32684eee95e885e718655f93951128c3/raw/
		7	PATCHFILES+= x265-asm-warnings.patch:-p1
		8
7	MAINTAINER= mi@aldan.algebra.com	9	MAINTAINER= mi@aldan.algebra.com
8	COMMENT= H.265/High Efficiency Video Coding (HEVC) format	10	COMMENT= H.265/High Efficiency Video Coding (HEVC) format
9	WWW= https://www.x265.org/	11	WWW= https://www.x265.org/
Lines 13-21 LICENSE_FILE= ${WRKSRC:H}/COPYING Link Here
13		15
14	USES= cmake compiler:c++14-lang cpe pathfix dos2unix	16	USES= cmake compiler:c++14-lang cpe pathfix dos2unix
15		17
16	CPE_VENDOR= multicorewareinc	18	CPE_VENDOR= multicorewareinc
17		19
18	BB_TAG= 25b2c07035ff # Top of the Release_3.4 branch at this time	20	BB_TAG= Release_${DISTVERSION}
19		21
20	OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS VMAF	22	OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS VMAF
21	OPTIONS_DEFAULT= OPTIMIZED_FLAGS HI8P HI10P HI12P	23	OPTIONS_DEFAULT= OPTIMIZED_FLAGS HI8P HI10P HI12P
Lines 30-36 OPTIONS_DEFAULT_powerpc64le= ASM Link Here
30	OPTIONS_MULTI= PixelWidth	32	OPTIONS_MULTI= PixelWidth
31	OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P	33	OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P
32		34
33	DOS2UNIX_FILES= abrEncApp.cpp	35	DOS2UNIX_FILES= common/scaler.cpp
34	DEBUG_PREVENTS= OPTIMIZED_FLAGS	36	DEBUG_PREVENTS= OPTIMIZED_FLAGS
35	DEBUG_PREVENTS_MSG= Optimizations are incompatible with debugging code	37	DEBUG_PREVENTS_MSG= Optimizations are incompatible with debugging code
36	DEBUG_CMAKE_ON= -DCMAKE_ASM_NASM_FLAGS:STRING="-g -O0"	38	DEBUG_CMAKE_ON= -DCMAKE_ASM_NASM_FLAGS:STRING="-g -O0"
Lines 41-47 SVTHEVC_CMAKE_ON= -DSVT_HEVC_INCLUDE_DIR:PATH="${LOCALBASE}/include/svt-hevc" Link Here
41	VMAF_LIB_DEPENDS= libvmaf.so:multimedia/vmaf	43	VMAF_LIB_DEPENDS= libvmaf.so:multimedia/vmaf
42	VMAF_USES= localbase:ldflags	44	VMAF_USES= localbase:ldflags
43	VMAF_CMAKE_BOOL= ENABLE_LIBVMAF	45	VMAF_CMAKE_BOOL= ENABLE_LIBVMAF
44	VMAF_CMAKE_ON= -DVMAF_INCLUDE_DIR:PATH="${LOCALBASE}/include/libvmaf"	46	VMAF_CMAKE_ON= -DVMAF_INCLUDE_DIR:PATH="${LOCALBASE}/include/libvmaf"
45		47
46	DEBUG_DESC= Enable debugging	48	DEBUG_DESC= Enable debugging
47	HI8P_DESC= Enable 8-bit pixel-width (you, probably, want this)	49	HI8P_DESC= Enable 8-bit pixel-width (you, probably, want this)
Lines 54-60 VMAF_DESC= Per frame and aggregate VMAF score Link Here
54	USE_LDCONFIG= yes	56	USE_LDCONFIG= yes
55	CMAKE_ARGS= -DENABLE_TESTS=on -DENABLE_HDR10_PLUS:BOOL=true	57	CMAKE_ARGS= -DENABLE_TESTS=on -DENABLE_HDR10_PLUS:BOOL=true
56	LDFLAGS_i386= -Wl,-znotext	58	LDFLAGS_i386= -Wl,-znotext
57	EXTRACT_AFTER_ARGS+= --exclude compat --strip-components=1	59	EXTRACT_AFTER_ARGS+= --exclude compat --exclude md5\.* --strip-components=1
58	PATCH_WRKSRC= ${WRKSRC:H}	60	PATCH_WRKSRC= ${WRKSRC:H}
59	WRKSRC= ${WRKDIR}/source	61	WRKSRC= ${WRKDIR}/source
60		62

Lines 1-6 Link Here

(-)b/multimedia/x265/files/patch-source_CMakeLists.txt (-6 / +6 lines)
1	--- source/CMakeLists.txt.orig 2021-10-31 01:46:10 UTC	1	--- source/CMakeLists.txt 2023-10-22 22:08:10.704150000 -0400
2	+++ source/CMakeLists.txt	2	+++ source/CMakeLists.txt 2023-10-22 22:10:02.947579000 -0400
3	@@ -43,7 +43,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd64)	3	@@ -43,7 +43,7 @@
4	set(ARM_ALIASES armv6l armv7l aarch64)	4	set(ARM_ALIASES armv6l armv7l aarch64)
5	list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)	5	list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
6	list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)	6	list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
Lines 9-15 Link Here
9	list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)	9	list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
10	if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")	10	if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
11	set(X86 1)	11	set(X86 1)
12	@@ -121,6 +121,7 @@ if(UNIX)	12	@@ -122,6 +122,7 @@
13	option(ENABLE_LIBVMAF "Enable VMAF" OFF)	13	option(ENABLE_LIBVMAF "Enable VMAF" OFF)
14	if(ENABLE_LIBVMAF)	14	if(ENABLE_LIBVMAF)
15	add_definitions(-DENABLE_LIBVMAF)	15	add_definitions(-DENABLE_LIBVMAF)
Lines 17-23 Link Here
17	endif()	17	endif()
18	endif(UNIX)	18	endif(UNIX)
19		19
20	@@ -592,12 +593,6 @@ if(ENABLE_HDR10_PLUS)	20	@@ -593,12 +594,6 @@
21	ARCHIVE DESTINATION ${LIB_INSTALL_DIR})	21	ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
22	endif()	22	endif()
23		23
Lines 30-36 Link Here
30	install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)	30	install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
31	if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))	31	if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
32	if(MSVC_IDE)	32	if(MSVC_IDE)
33	@@ -649,7 +644,10 @@ if(ENABLE_SHARED)	33	@@ -650,7 +645,10 @@
34	if(EXTRA_LIB)	34	if(EXTRA_LIB)
35	target_link_libraries(x265-shared ${EXTRA_LIB})	35	target_link_libraries(x265-shared ${EXTRA_LIB})
36	endif()	36	endif()

Lines 1-4 Link Here

(-)b/multimedia/x265/files/patch-source_common_version.cpp (-10 / +1 lines)
1	--- source/common/version.cpp.orig 2020-05-29 17:39:35 UTC	1	--- source/common/version.cpp.orig 2023-06-27 14:11:49 UTC
2	+++ source/common/version.cpp	2	+++ source/common/version.cpp
3	@@ -63,6 +63,8 @@	3	@@ -63,6 +63,8 @@
4	#define ONOS "[Linux]"	4	#define ONOS "[Linux]"
Lines 9-20 Link Here
9	#elif __CYGWIN__	9	#elif __CYGWIN__
10	#define ONOS "[Cygwin]"	10	#define ONOS "[Cygwin]"
11	#elif __APPLE__	11	#elif __APPLE__
12	@@ -71,7 +73,7 @@
13	#define ONOS "[Unk-OS]"
14	#endif
15
16	-#if X86_64
17	+#if defined(X86_64) \|\| X265_ARCH_ARM64
18	#define BITS "[64 bit]"
19	#else
20	#define BITS "[32 bit]"

Lines 1-13 Link Here

(-)b/multimedia/x265/files/patch-source_x265.h (-4 / +4 lines)
1	https://github.com/Netflix/vmaf/commit/122089fa3d23	1	https://github.com/Netflix/vmaf/commit/122089fa3d23
2		2
3	--- source/x265.h.orig 2020-09-16 15:52:49 UTC	3	--- source/x265.h.orig 2023-06-27 14:11:49 UTC
4	+++ source/x265.h	4	+++ source/x265.h
5	@@ -733,7 +733,7 @@ typedef struct x265_vmaf_commondata	5	@@ -753,7 +753,7 @@ typedef struct x265_vmaf_commondata
6	int enable_conf_interval;	6	int enable_conf_interval;
7	}x265_vmaf_commondata;	7	}x265_vmaf_commondata;
8		8
9	-static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } };	9	-static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } };
10	+static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.json", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } };	10	+static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.json", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } };
11		11
12	/* x265 input parameters	12	typedef struct x265_temporal_layer {
13	*	13	int poc_offset; /* POC offset */