From 85e4610d3bfea36d5d7eb3096cb19ef055569578 Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Thu, 15 Oct 2026 14:27:51 +1300 Subject: [PATCH] x65: upgrade 4.2 -> 4.3 - Update SRC_URI as official repository moved to GitHub[1] - Replace 0001-json11.cpp-Include-cstdint.patch with upstream backport - Refresh 0002-x265-fix-build-with-cmake-4.patch Changelog: https://github.com/Multicorewareinc/x265/blob/4.3/doc/reST/releasenotes.rst [1] https://www.x265.org/#contribute Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...1-fix-dynamicHDR10-undefined-uint8_t.patch | 23 +++++++++++++ .../0001-json11.cpp-Include-cstdint.patch | 33 ------------------- ...=> 0002-x265-fix-build-with-cmake-4.patch} | 31 +++++++---------- .../x265/{x265_4.2.bb => x265_4.3.bb} | 13 ++++---- 4 files changed, 40 insertions(+), 60 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/x265/x265/0001-fix-dynamicHDR10-undefined-uint8_t.patch delete mode 100644 meta-multimedia/recipes-multimedia/x265/x265/0001-json11.cpp-Include-cstdint.patch rename meta-multimedia/recipes-multimedia/x265/x265/{0001-x265-fix-build-with-cmake-4.patch => 0002-x265-fix-build-with-cmake-4.patch} (61%) rename meta-multimedia/recipes-multimedia/x265/{x265_4.2.bb => x265_4.3.bb} (72%) diff --git a/meta-multimedia/recipes-multimedia/x265/x265/0001-fix-dynamicHDR10-undefined-uint8_t.patch b/meta-multimedia/recipes-multimedia/x265/x265/0001-fix-dynamicHDR10-undefined-uint8_t.patch new file mode 100644 index 0000000000..cce6c8f6f2 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/x265/x265/0001-fix-dynamicHDR10-undefined-uint8_t.patch @@ -0,0 +1,23 @@ +From 3b7d8d1e6134db80db46a927c06c33074dcb4bda Mon Sep 17 00:00:00 2001 +From: ReenigneArcher +Date: Wed, 9 Jul 2025 14:41:33 +0000 +Subject: [PATCH] fix(dynamicHDR10): undefined-uint8_t + +(cherry picked from commit 98eec4057fc20850b59ed292b3f13ddeefc2f93f) +Signed-off-by: Ankur Tyagi +--- + source/dynamicHDR10/json11/json11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source/dynamicHDR10/json11/json11.cpp b/source/dynamicHDR10/json11/json11.cpp +index 762577735..c111ebb82 100644 +--- a/source/dynamicHDR10/json11/json11.cpp ++++ b/source/dynamicHDR10/json11/json11.cpp +@@ -22,6 +22,7 @@ + #include "json11.h" + #include + #include ++#include + #include + #include + #include diff --git a/meta-multimedia/recipes-multimedia/x265/x265/0001-json11.cpp-Include-cstdint.patch b/meta-multimedia/recipes-multimedia/x265/x265/0001-json11.cpp-Include-cstdint.patch deleted file mode 100644 index f32316009f..0000000000 --- a/meta-multimedia/recipes-multimedia/x265/x265/0001-json11.cpp-Include-cstdint.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6cbd417be3f6bcbda77464db6a4d83cef3df8904 Mon Sep 17 00:00:00 2001 -From: Leon Anavi -Date: Mon, 5 May 2025 14:08:36 +0000 -Subject: [PATCH] json11.cpp: Include cstdint - -Fixes: - -json11.cpp:101:32: error: 'uint8_t' does not name a type - -This work was sponsored by GOVCERT.LU. - -Upstream-Status: Pending [https://bitbucket.org/multicoreware/x265_git/pull-requests/33] - -Signed-off-by: Leon Anavi ---- - dynamicHDR10/json11/json11.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dynamicHDR10/json11/json11.cpp b/dynamicHDR10/json11/json11.cpp -index 7625777..74f990a 100644 ---- a/dynamicHDR10/json11/json11.cpp -+++ b/dynamicHDR10/json11/json11.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #if _MSC_VER - #pragma warning(disable: 4510) //const member cannot be default initialized --- -2.39.5 - diff --git a/meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch b/meta-multimedia/recipes-multimedia/x265/x265/0002-x265-fix-build-with-cmake-4.patch similarity index 61% rename from meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch rename to meta-multimedia/recipes-multimedia/x265/x265/0002-x265-fix-build-with-cmake-4.patch index 7d301777f0..64da2c31e0 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch +++ b/meta-multimedia/recipes-multimedia/x265/x265/0002-x265-fix-build-with-cmake-4.patch @@ -1,4 +1,4 @@ -From f376b858b38f8a3b922bb9a5165a5f6f806bd245 Mon Sep 17 00:00:00 2001 +From 5e759128b016cb03866ada875166560155b9d21e Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Thu, 10 Jul 2025 09:04:27 +0200 Subject: [PATCH] x265: fix build with cmake 4 @@ -8,16 +8,17 @@ with 4.0 Signed-off-by: Markus Volk -Upstream-Status: Submitted [https://github.com/videolan/x265/pull/17] +Upstream-Status: Submitted [https://github.com/Multicorewareinc/x265/pull/996] +Signed-off-by: Ankur Tyagi --- source/CMakeLists.txt | 2 +- - source/dynamicHDR10/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + source/dynamicHDR10/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 2e3beaaf3..45df2e9fd 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +index 3177af99a..f1364b886 100755 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt @@ -11,7 +11,7 @@ if(POLICY CMP0042) cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH endif() @@ -28,9 +29,9 @@ index 2e3beaaf3..45df2e9fd 100755 if (POLICY CMP0075) cmake_policy(SET CMP0075 NEW) # CMAKE_REQUIRED_LIBRARIES warning diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt -index 4243338c6..03c866b1f 100644 ---- a/dynamicHDR10/CMakeLists.txt -+++ b/dynamicHDR10/CMakeLists.txt +index 4243338c6..2c3af4f00 100644 +--- a/source/dynamicHDR10/CMakeLists.txt ++++ b/source/dynamicHDR10/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(dynamicHDR10 OBJECT hdr10plus.h api.cpp ) @@ -40,13 +41,3 @@ index 4243338c6..03c866b1f 100644 project(dynamicHDR10) include(CheckIncludeFiles) include(CheckFunctionExists) -@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") - option(ENABLE_SHARED "Build shared library" OFF) - - install(FILES hdr10plus.h DESTINATION include) --endif() -\ No newline at end of file -+endif() --- -2.43.0 - diff --git a/meta-multimedia/recipes-multimedia/x265/x265_4.2.bb b/meta-multimedia/recipes-multimedia/x265/x265_4.3.bb similarity index 72% rename from meta-multimedia/recipes-multimedia/x265/x265_4.2.bb rename to meta-multimedia/recipes-multimedia/x265/x265_4.3.bb index 9bef2b8bd2..6459fbc8cf 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265_4.2.bb +++ b/meta-multimedia/recipes-multimedia/x265/x265_4.3.bb @@ -1,6 +1,6 @@ SUMMARY = "H.265/HEVC video encoder" DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." -HOMEPAGE = "https://bitbucket.org/multicoreware/x265_git" +HOMEPAGE = "https://github.com/Multicorewareinc/x265" LICENSE = "GPL-2.0-only" LICENSE_FLAGS = "commercial" @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" DEPENDS = "nasm-native gnutls zlib libpcre numactl" SRC_URI = " \ - https://download.videolan.org/pub/pub/videolan/${BPN}/${BPN}_${PV}.tar.gz \ - file://0001-json11.cpp-Include-cstdint.patch \ - file://0001-x265-fix-build-with-cmake-4.patch \ + git://github.com/Multicorewareinc/x265.git;protocol=https;branch=master;tag=${PV} \ + file://0001-fix-dynamicHDR10-undefined-uint8_t.patch \ + file://0002-x265-fix-build-with-cmake-4.patch \ " -SRC_URI[sha256sum] = "40b1ea0453e0309f0eba934e0ddf533f8f6295966679e8894e8f1c1c8d5e1210" -S = "${UNPACKDIR}/x265_${PV}/source" +SRCREV = "e9b88125dc21393b3fd8d68e98083bdfb89778a8" +S = "${UNPACKDIR}/x265-${PV}/source" inherit lib_package cmake pkgconfig @@ -30,4 +30,3 @@ PACKAGECONFIG[10bit] = "-DHIGH_BIT_DEPTH=ON,-DHIGH_BIT_DEPTH=OFF" FILES:${PN} += "${libdir}/libhdr10plus.so" FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/libx265.so" -