diff --git a/meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch b/meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch index f218fec5f7..7d301777f0 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch +++ b/meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch @@ -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 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 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 diff --git a/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_4.2.bb similarity index 87% rename from meta-multimedia/recipes-multimedia/x265/x265_4.1.bb rename to meta-multimedia/recipes-multimedia/x265/x265_4.2.bb index 79dd99220e..9bef2b8bd2 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb +++ b/meta-multimedia/recipes-multimedia/x265/x265_4.2.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" DEPENDS = "nasm-native gnutls zlib libpcre numactl" SRC_URI = " \ - https://bitbucket.org/multicoreware/x265_git/downloads/x265_${PV}.tar.gz \ + 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 \ " -SRC_URI[sha256sum] = "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29" +SRC_URI[sha256sum] = "40b1ea0453e0309f0eba934e0ddf533f8f6295966679e8894e8f1c1c8d5e1210" S = "${UNPACKDIR}/x265_${PV}/source" inherit lib_package cmake pkgconfig