@@ -1,4 +1,4 @@
-From de68f4d02946d588af6a0c21cf966288c40b039f Mon Sep 17 00:00:00 2001
+From f376b858b38f8a3b922bb9a5165a5f6f806bd245 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Thu, 10 Jul 2025 09:04:27 +0200
Subject: [PATCH] x265: fix build with cmake 4
@@ -10,43 +10,32 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
Upstream-Status: Submitted [https://github.com/videolan/x265/pull/17]
---
- source/CMakeLists.txt | 8 +-------
+ source/CMakeLists.txt | 2 +-
source/dynamicHDR10/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 9 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c6dda9e8..bd9e0f8d9 100755
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 2e3beaaf3..45df2e9fd 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -6,18 +6,12 @@ if(NOT CMAKE_BUILD_TYPE)
- FORCE)
- endif()
- message(STATUS "cmake version ${CMAKE_VERSION}")
--if(POLICY CMP0025)
-- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
--endif()
- if(POLICY CMP0042)
+@@ -11,7 +11,7 @@ if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
endif()
--if(POLICY CMP0054)
-- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
--endif()
- project (x265)
--cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+-cmake_minimum_required (VERSION 2.8.8...3.10) # OBJECT libraries require 2.8.8
+cmake_minimum_required (VERSION 2.8.8...4.0) # OBJECT libraries require 2.8.8
- include(CheckIncludeFiles)
- include(CheckFunctionExists)
- include(CheckSymbolExists)
-diff --git a/dynamicHDR10/CMakeLists.txt b/dynamicHDR10/CMakeLists.txt
-index 22fb79d44..03c866b1f 100644
+
+ 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
@@ -10,7 +10,7 @@ add_library(dynamicHDR10 OBJECT
hdr10plus.h
api.cpp )
--cmake_minimum_required (VERSION 2.8.11)
+-cmake_minimum_required (VERSION 2.8.11...3.26)
+cmake_minimum_required (VERSION 2.8.11...4.0)
project(dynamicHDR10)
include(CheckIncludeFiles)
@@ -59,5 +48,5 @@ index 22fb79d44..03c866b1f 100644
\ No newline at end of file
+endif()
--
-2.49.0
+2.43.0
similarity index 93%
rename from meta-multimedia/recipes-multimedia/x265/x265_4.1.bb
rename to meta-multimedia/recipes-multimedia/x265/x265_4.2.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
file://0001-json11.cpp-Include-cstdint.patch \
file://0001-x265-fix-build-with-cmake-4.patch \
"
-SRC_URI[sha256sum] = "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29"
+SRC_URI[sha256sum] = "40b1ea0453e0309f0eba934e0ddf533f8f6295966679e8894e8f1c1c8d5e1210"
S = "${UNPACKDIR}/x265_${PV}/source"
inherit lib_package cmake pkgconfig
Upgrade to release 4.2: - Threaded Motion Estimation (Experimental feature)-It uses a dedicated threadpool to precompute Motion Estimation in parallel. Improves encoding speed upto 1.5x for 1080p & lower resolution on multi core machines with low frequency setting. On high frequency systems or on machines with low number of cores, the overhead of additional Motion estimation work may outweigh parallelism - Add new Levels 6.3 to 7.2 specified in ITU-T H.265 (V9) (09/2023) and above - Improve Slices feature with check zeroMv - Enable frame parallelism with MCSTF feature - Updated support to signal AOM FGM params - Improve quality with SBRC feature 6.Updated DolbyVision P5 VUI defaults - API Support to enable Threaded Motion Estimation(-threaded-me) - RISC V optimizations including SAD, SATD, DCT, IDCT, block copy, pixel utilities, SAO, loopfilter, transpose kernels resulting in 2x encoding speed. - ARM SIMD optimizations including the use of NEON and SVE instruction set extensions. The following algorithms now have optimized SIMD implementations: DST, IDCT, SSE, SSD, intra_pred_planar, pelFilterLumaStrong, interpolation, planecopy, dequant_normal, blockcopy, pixel variance resulting in 8% faster encoding speed compared to v4.1 - Fix memory leaks (no command line option, SEI buffer, analysis save/load) - Fix chroma qp offset for non yuv444 inputs - Fix max supported input resolution - Fix bugs with ARM SIMD optimizations - Fix Alpha and Multiview feature flag support in x265_config - Fix test harness issues, CMake errors - Fix inconsistent output with aq-motion - Fix crash with hist-scenecut on high bit-depth builds - Fix lookahead concurrency bug - Fix shared link issue (R_X86_64_PC32), yuv recon output issue, rd-refine and dynamic-refine issue, inputs for Windows named pipe, weighted prediction delta_chroma_offset, crf and vbv issue in abr-ladder, psnr and ssim reported with MCSTF feature, internally overflowed VBV variables This work was sponsored by GOVCERT.LU. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- .../0001-x265-fix-build-with-cmake-4.patch | 39 +++++++------------ .../x265/{x265_4.1.bb => x265_4.2.bb} | 2 +- 2 files changed, 15 insertions(+), 26 deletions(-) rename meta-multimedia/recipes-multimedia/x265/{x265_4.1.bb => x265_4.2.bb} (93%)