From f17b41d7f91fea6c3879a0d15448740e58f56dfd Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Fri, 30 May 2025 08:52:24 -0400 Subject: [PATCH] x265: update to 4.0. --- common/shlibs | 2 +- .../x265/patches/handbrake-ambientlight.patch | 50 +++++++++---------- srcpkgs/x265/template | 30 +++++------ 3 files changed, 39 insertions(+), 43 deletions(-) diff --git a/common/shlibs b/common/shlibs index b8b55d50fb2..74d8f49f678 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1951,7 +1951,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3 libQt5WebKit.so.5 qt5-webkit-5.6.0_1 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1 -libx265.so.209 x265-3.6_1 +libx265.so.212 x265-4.0_1 libQt5Xdg.so.3 libqt5xdg-3.2.0_1 libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1 libQt6Xdg.so.4 libqtxdg-4.0.0_1 diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch index ab36a9c35c9..5c966e42f0c 100644 --- a/srcpkgs/x265/patches/handbrake-ambientlight.patch +++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch @@ -1,8 +1,7 @@ -diff --git a/source/common/param.cpp b/source/common/param.cpp -index 8c32fafa2..0b56235c9 100755 ---- a/source/common/param.cpp -+++ b/source/common/param.cpp -@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param) +diff -ru a/source/common/param.cpp b/source/common/param.cpp +--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300 +@@ -380,6 +380,7 @@ param->preferredTransferCharacteristics = -1; param->pictureStructure = -1; param->bEmitCLL = 1; @@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755 param->bEnableFrameDuplication = 0; param->dupThreshold = 70; -@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param) +@@ -1929,6 +1930,7 @@ || param->bEmitIDRRecoverySEI || !!param->interlaceMode || param->preferredTransferCharacteristics > 1 @@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755 || param->toneMapFile || param->naluFile); -@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src) +@@ -2850,6 +2852,10 @@ dst->bEmitCLL = src->bEmitCLL; dst->maxCLL = src->maxCLL; dst->maxFALL = src->maxFALL; @@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755 dst->log2MaxPocLsb = src->log2MaxPocLsb; dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo; dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo; -diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp -index 5950f87e9..545283474 100644 ---- a/source/encoder/encoder.cpp -+++ b/source/encoder/encoder.cpp -@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs) +diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp +--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300 +@@ -3423,6 +3423,15 @@ } } @@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644 if (m_param->bEmitInfoSEI) { char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset); -diff --git a/source/encoder/sei.h b/source/encoder/sei.h -index 03e210639..712e4efb4 100644 ---- a/source/encoder/sei.h -+++ b/source/encoder/sei.h -@@ -242,6 +242,25 @@ public: +diff -ru a/source/encoder/sei.h b/source/encoder/sei.h +--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300 +@@ -464,6 +464,25 @@ } }; @@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644 class SEIDecodedPictureHash : public SEI { public: -diff --git a/source/x265.h b/source/x265.h -index 9f3abd9d9..b6a4d3fe1 100644 ---- a/source/x265.h -+++ b/source/x265.h -@@ -371,6 +371,7 @@ typedef enum +diff -ru a/source/x265.h b/source/x265.h +--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300 +@@ -371,6 +371,7 @@ MASTERING_DISPLAY_INFO = 137, CONTENT_LIGHT_LEVEL_INFO = 144, ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147, + AMBIENT_VIEWING_ENVIRONMENT = 148, - } SEIPayloadType; - - typedef struct x265_sei_payload -@@ -1903,6 +1904,11 @@ typedef struct x265_param + ALPHA_CHANNEL_INFO = 165, + THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176, + MULTIVIEW_SCENE_INFO = 178, +@@ -1956,6 +1957,11 @@ * value to that value. */ uint16_t maxLuma; @@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644 /* Maximum of the picture order count */ int log2MaxPocLsb; -@@ -2114,6 +2120,9 @@ typedef struct x265_param +@@ -2167,6 +2173,9 @@ /*Emit content light level info SEI*/ int bEmitCLL; diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index d95e93552f6..4acc7cd5ff2 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -1,7 +1,7 @@ # Template file for 'x265' pkgname=x265 -version=3.6 -revision=2 +version=4.0 +revision=1 build_wrksrc=source build_style=cmake configure_args="-DENABLE_PIC=1 -DEXTRA_LINK_FLAGS='-L.' @@ -12,7 +12,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://x265.org/" distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz" -checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b +checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389 build_options="altivec assembly" @@ -23,28 +23,28 @@ case "$XBPS_TARGET_MACHINE" in ppc64le*) build_options_default="altivec" ;; # on ARM, enabling it currently fails with undefined reference to # x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int) - x86_64*|i686*) build_options_default="assembly" ;; + x86_64* | i686*) build_options_default="assembly" ;; *) ;; esac if [ "$build_option_assembly" ]; then case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) - # see https://bitbucket.org/multicoreware/x265_git/issues/559 - configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy" - hostmakedepends+=" nasm" - ;; - *) ;; + x86_64* | i686*) + # see https://bitbucket.org/multicoreware/x265_git/issues/559 + configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy" + hostmakedepends+=" nasm" + ;; + *) ;; esac fi case "$XBPS_TARGET_MACHINE" in - ppc64*) - # altivec does not build without power8 being enabled - configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF) +ppc64*) + # altivec does not build without power8 being enabled + configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF) -DCPU_POWER8=$(vopt_if altivec ON OFF)" - ;; - *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;; + ;; +*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;; esac pre_configure() {