Attachment 245689 Details for Bug 274526 – x265-3.5.patch

[patch] x265-3.5.patch

x265-3.5.patch (text/plain), 10.61 KB, created by takefu on 2023-10-17 05:45:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2023-10-17 05:45:27 UTC

Size: 10.61 KB

patch

obsolete

>diff -udprN /usr/ports/multimedia/x265/Makefile ./Makefile
>--- /usr/ports/multimedia/x265/Makefile	2022-10-29 20:50:06.000000000 +0000
>+++ ./Makefile	2023-07-10 02:38:22.878151000 +0000
>@@ -1,6 +1,5 @@
> PORTNAME=	x265
>-PORTVERSION=	3.4
>-PORTREVISION=	2
>+DISTVERSION=	3.5
> CATEGORIES=	multimedia
> MASTER_SITES=	https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/
> 
>@@ -13,24 +12,37 @@ LICENSE_FILE=	${WRKSRC:H}/COPYING
> 
> USES=		cmake compiler:c++14-lang cpe pathfix dos2unix
> 
>-CPE_VENDOR=		multicorewareinc
>+CPE_VENDOR=	multicorewareinc
>+DOS2UNIX_FILES=	abrEncApp.cpp
>+USE_LDCONFIG=	yes
>+CMAKE_ARGS=	-DENABLE_TESTS=on -DENABLE_HDR10_PLUS:BOOL=true
>+LDFLAGS_i386=	-Wl,-znotext
>+EXTRACT_AFTER_ARGS+=	--exclude compat --strip-components=1
>+PATCH_WRKSRC=	${WRKSRC:H}
>+WRKSRC=		${WRKDIR}/source
> 
>-BB_TAG=	25b2c07035ff	# Top of the Release_3.4 branch at this time
>+BB_TAG=		8f18e3a	# Top of the Release_3.5 branch at this time
> 
> OPTIONS_DEFINE=		DEBUG OPTIMIZED_FLAGS VMAF
>-OPTIONS_DEFAULT=	OPTIMIZED_FLAGS HI8P HI10P HI12P
> OPTIONS_DEFINE_aarch64=	ASM
> OPTIONS_DEFINE_amd64=	ASM SVTHEVC
> OPTIONS_DEFINE_i386=	ASM
> OPTIONS_DEFINE_powerpc64=	ASM
> OPTIONS_DEFINE_powerpc64le=	ASM
>+OPTIONS_DEFAULT=	OPTIMIZED_FLAGS HI8P HI10P HI12P
> OPTIONS_DEFAULT_amd64=	ASM
> OPTIONS_DEFAULT_powerpc64le=	ASM
>-
> OPTIONS_MULTI=		PixelWidth
> OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P
> 
>-DOS2UNIX_FILES=		abrEncApp.cpp
>+DEBUG_DESC=	Enable debugging
>+HI10P_DESC=	Enable 10-bit pixels (may break on i386)
>+HI12P_DESC=	Enable 12-bit pixels (may break on i386)
>+HI8P_DESC=	Enable 8-bit pixel-width (you, probably, want this)
>+OPTIMIZED_FLAGS_DESC=	Enable O3 optimization
>+SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
>+VMAF_DESC=	Per frame and aggregate VMAF score
>+
> DEBUG_PREVENTS=		OPTIMIZED_FLAGS
> DEBUG_PREVENTS_MSG=	Optimizations are incompatible with debugging code
> DEBUG_CMAKE_ON=		-DCMAKE_ASM_NASM_FLAGS:STRING="-g -O0"
>@@ -43,21 +55,6 @@ 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)
>-HI10P_DESC=	Enable 10-bit pixels (may break on i386)
>-HI12P_DESC=	Enable 12-bit pixels (may break on i386)
>-OPTIMIZED_FLAGS_DESC=	Enable O3 optimization
>-SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
>-VMAF_DESC=	Per frame and aggregate VMAF score
>-
>-USE_LDCONFIG=	yes
>-CMAKE_ARGS=	-DENABLE_TESTS=on -DENABLE_HDR10_PLUS:BOOL=true
>-LDFLAGS_i386=	-Wl,-znotext
>-EXTRACT_AFTER_ARGS+=	--exclude compat --strip-components=1
>-PATCH_WRKSRC=	${WRKSRC:H}
>-WRKSRC=		${WRKDIR}/source
>-
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == aarch64 && ${PORT_OPTIONS:MASM}
>@@ -103,9 +100,9 @@ ASSEMBLY=true
> .endif
> 
> .if ${PORT_OPTIONS:MASM}
>-POWER8=	true
>+POWER8=true
> .else
>-POWER8=	false
>+POWER8=false
> .endif
> 
> pre-build::
>diff -udprN /usr/ports/multimedia/x265/distinfo ./distinfo
>--- /usr/ports/multimedia/x265/distinfo	2020-09-21 04:47:33.000000000 +0000
>+++ ./distinfo	2023-07-10 02:40:51.902454000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1600662771
>-SHA256 (x265-3.4.tar.gz) = 01f17d94689ef79807fa2b4bd7f5f58bb18416e72a135c7f56c30162a980cfb8
>-SIZE (x265-3.4.tar.gz) = 1532396
>+TIMESTAMP = 1688956851
>+SHA256 (x265-3.5.tar.gz) = 3c660f30f49ecf734252c7b4bc8464ebca0b34609f85a1bf04d5af12b87f7ffd
>+SIZE (x265-3.5.tar.gz) = 1625431
>diff -udprN /usr/ports/multimedia/x265/files/patch-source_CMakeLists.txt ./files/patch-source_CMakeLists.txt
>--- /usr/ports/multimedia/x265/files/patch-source_CMakeLists.txt	2021-11-16 14:44:19.000000000 +0000
>+++ ./files/patch-source_CMakeLists.txt	2023-07-10 03:15:24.477227000 +0000
>@@ -1,15 +1,15 @@
>---- source/CMakeLists.txt.orig	2021-10-31 01:46:10 UTC
>+--- source/CMakeLists.txt.orig	2023-06-27 14:11:49 UTC
> +++ source/CMakeLists.txt
>-@@ -43,7 +43,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
>- set(ARM_ALIASES armv6l armv7l aarch64)
>+@@ -49,7 +49,7 @@ set(ARM64_ALIASES arm64 arm64e aarch64)
>  list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
>  list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
>+ list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)
> -set(POWER_ALIASES ppc64 ppc64le)
> +set(POWER_ALIASES powerpc64 powerpc64le ppc64 ppc64le)
>  list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
>- if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
>+ if(X86MATCH GREATER "-1")
>      set(X86 1)
>-@@ -121,6 +121,7 @@ if(UNIX)
>+@@ -130,6 +130,7 @@ if(UNIX)
>      option(ENABLE_LIBVMAF "Enable VMAF" OFF)
>      if(ENABLE_LIBVMAF)
>          add_definitions(-DENABLE_LIBVMAF)
>@@ -17,7 +17,7 @@
>      endif()
>  endif(UNIX)
>  
>-@@ -592,12 +593,6 @@ if(ENABLE_HDR10_PLUS)
>+@@ -623,12 +624,6 @@ if(ENABLE_HDR10_PLUS)
>          ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
>  endif()
>  
>@@ -30,7 +30,7 @@
>  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)
>-@@ -649,7 +644,10 @@ if(ENABLE_SHARED)
>+@@ -680,7 +675,10 @@ if(ENABLE_SHARED)
>      if(EXTRA_LIB)
>          target_link_libraries(x265-shared ${EXTRA_LIB})
>      endif()
>diff -udprN /usr/ports/multimedia/x265/files/patch-source_cmake_Findsvthevc.cmake ./files/patch-source_cmake_Findsvthevc.cmake
>--- /usr/ports/multimedia/x265/files/patch-source_cmake_Findsvthevc.cmake	2020-09-20 22:17:52.000000000 +0000
>+++ ./files/patch-source_cmake_Findsvthevc.cmake	2023-06-07 21:54:09.888871000 +0000
>@@ -1,6 +1,7 @@
>---- source/cmake/Findsvthevc.cmake	2020-05-29 17:39:35.000000000 +0000
>-+++ source/cmake/Findsvthevc.cmake	2020-08-07 02:26:55.307048000 +0000
>-@@ -39,9 +39,5 @@
>+--- source/cmake/Findsvthevc.cmake.orig	2023-05-08 09:43:31 UTC
>++++ source/cmake/Findsvthevc.cmake
>+@@ -38,11 +38,7 @@ if(SVT_HEVC_INCLUDE_DIR)
>+         string(REGEX MATCH "SVT_VERSION_PATCHLEVEL  \$([0-9]*)\$" _ ${version})
>          set(SVT_VERSION_PATCHLEVEL ${CMAKE_MATCH_1})
>  
> -        if(NOT ${SVT_VERSION_MAJOR} EQUAL "1" OR NOT ${SVT_VERSION_MINOR} EQUAL "4" OR NOT ${SVT_VERSION_PATCHLEVEL} EQUAL "1")
>@@ -11,3 +12,4 @@
> +        message(STATUS "-- Found SVT-HEVC Lib Version: ${SVT_VERSION_MAJOR}.${SVT_VERSION_MINOR}.${SVT_VERSION_PATCHLEVEL}")
>      else()
>          message (SEND_ERROR "-- Required version of SVT-HEVC Lib: ${SVT_VERSION_MAJOR_REQUIRED}.${SVT_VERSION_MINOR_REQUIRED}.${SVT_VERSION_PATCHLEVEL_REQUIRED}; Aborting configure  ")
>+     endif()
>diff -udprN /usr/ports/multimedia/x265/files/patch-source_common_version.cpp ./files/patch-source_common_version.cpp
>--- /usr/ports/multimedia/x265/files/patch-source_common_version.cpp	2020-09-20 22:17:52.000000000 +0000
>+++ ./files/patch-source_common_version.cpp	2023-07-10 03:15:24.490955000 +0000
>@@ -1,4 +1,4 @@
>---- source/common/version.cpp.orig	2020-05-29 17:39:35 UTC
>+--- source/common/version.cpp.orig	2023-06-27 14:11:49 UTC
> +++ source/common/version.cpp
> @@ -63,6 +63,8 @@
>  #define ONOS    "[Linux]"
>@@ -9,12 +9,3 @@
>  #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]"
>diff -udprN /usr/ports/multimedia/x265/files/patch-source_encoder_api.cpp ./files/patch-source_encoder_api.cpp
>--- /usr/ports/multimedia/x265/files/patch-source_encoder_api.cpp	2020-09-21 17:15:50.000000000 +0000
>+++ ./files/patch-source_encoder_api.cpp	2023-07-10 03:15:24.500155000 +0000
>@@ -8,9 +8,10 @@ See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=
> 
> 	-mi
> 
>---- source/encoder/api.cpp	2020-05-29 13:39:35.000000000 -0400
>-+++ source/encoder/api.cpp	2020-08-06 22:51:30.227635000 -0400
>-@@ -451,5 +451,7 @@
>+--- source/encoder/api.cpp.orig	2023-06-27 14:11:49 UTC
>++++ source/encoder/api.cpp
>+@@ -449,14 +449,18 @@ int x265_encoder_encode(x265_encoder *enc, x265_nal **
>+ 
>                  if (pic_in->rpu.payloadSize)
>                  {
> +#if ! SVT_CHECK_VERSION(1, 5, 0)
>@@ -18,7 +19,8 @@ See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=
> +#endif
>                      memcpy(inputData->dolbyVisionRpu.payload, pic_in->rpu.payload, pic_in->rpu.payloadSize);
>                      inputData->dolbyVisionRpu.payloadSize = pic_in->rpu.payloadSize;
>-@@ -458,5 +460,7 @@
>+                     inputData->dolbyVisionRpu.payloadType = NAL_UNIT_UNSPECIFIED;
>+                 }
>                  else
>                  {
> +#if ! SVT_CHECK_VERSION(1, 5, 0)
>@@ -26,7 +28,9 @@ See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=
> +#endif
>                      inputData->dolbyVisionRpu.payloadSize = 0;
>                  }
>-@@ -696,5 +700,7 @@
>+ 
>+@@ -702,7 +706,9 @@ void x265_encoder_close(x265_encoder *enc)
>+ 
>              svt_print_summary(enc);
>              EB_H265_ENC_INPUT *inputData = (EB_H265_ENC_INPUT*)encoder->m_svtAppData->inputPictureBuffer->pBuffer;
> +#if ! SVT_CHECK_VERSION(1, 5, 0)
>@@ -34,11 +38,14 @@ See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=
> +#endif
>  
>              X265_FREE(inputData);
>-@@ -2052,5 +2058,7 @@
>+             X265_FREE(encoder->m_svtAppData->inputPictureBuffer);
>+@@ -2063,7 +2069,9 @@ int svt_initialise_input_buffer(x265_encoder *enc)
>+     inputPtr->pBuffer = (unsigned char*)x265_malloc(sizeof(EB_H265_ENC_INPUT));
>  
>      EB_H265_ENC_INPUT *inputData = (EB_H265_ENC_INPUT*)inputPtr->pBuffer;
> +#if ! SVT_CHECK_VERSION(1, 5, 0)
>      inputData->dolbyVisionRpu.payload = NULL;
> +#endif
>      inputData->dolbyVisionRpu.payloadSize = 0;
>+ 
>  
>diff -udprN /usr/ports/multimedia/x265/files/patch-source_x265.h ./files/patch-source_x265.h
>--- /usr/ports/multimedia/x265/files/patch-source_x265.h	2021-11-08 16:34:49.000000000 +0000
>+++ ./files/patch-source_x265.h	2023-07-10 03:15:24.504691000 +0000
>@@ -1,13 +1,13 @@
> https://github.com/Netflix/vmaf/commit/122089fa3d23
> 
>---- source/x265.h.orig	2020-09-16 15:52:49 UTC
>+--- source/x265.h.orig	2023-06-27 14:11:49 UTC
> +++ source/x265.h
>-@@ -733,7 +733,7 @@ typedef struct x265_vmaf_commondata
>+@@ -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 } };
>  
>- /* x265 input parameters
>-  *
>+ typedef struct x265_temporal_layer {
>+     int poc_offset;      /* POC offset */
>diff -udprN /usr/ports/multimedia/x265/pkg-plist ./pkg-plist
>--- /usr/ports/multimedia/x265/pkg-plist	2020-09-20 22:17:52.000000000 +0000
>+++ ./pkg-plist	2023-07-10 04:04:07.493252000 +0000
>@@ -6,5 +6,5 @@ lib/libhdr10plus.a
> lib/libhdr10plus.so
> lib/libx265.a
> lib/libx265.so
>-lib/libx265.so.192
>+lib/libx265.so.208
> libdata/pkgconfig/x265.pc

Actions: View | Diff

Attachments on bug 274526: 245689 | 245810 | 245811 | 245812 | 247074 | 247127