diff options
| -rw-r--r-- | meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch | 63 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/x265/x265_4.1.bb | 1 |
2 files changed, 64 insertions, 0 deletions
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 new file mode 100644 index 0000000000..f218fec5f7 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/x265/x265/0001-x265-fix-build-with-cmake-4.patch | |||
| @@ -0,0 +1,63 @@ | |||
| 1 | From de68f4d02946d588af6a0c21cf966288c40b039f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Thu, 10 Jul 2025 09:04:27 +0200 | ||
| 4 | Subject: [PATCH] x265: fix build with cmake 4 | ||
| 5 | |||
| 6 | drop policies that have been removed in cmake 4 and allow to build | ||
| 7 | with 4.0 | ||
| 8 | |||
| 9 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://github.com/videolan/x265/pull/17] | ||
| 12 | --- | ||
| 13 | source/CMakeLists.txt | 8 +------- | ||
| 14 | source/dynamicHDR10/CMakeLists.txt | 4 ++-- | ||
| 15 | 2 files changed, 3 insertions(+), 9 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 18 | index 5c6dda9e8..bd9e0f8d9 100755 | ||
| 19 | --- a/CMakeLists.txt | ||
| 20 | +++ b/CMakeLists.txt | ||
| 21 | @@ -6,18 +6,12 @@ if(NOT CMAKE_BUILD_TYPE) | ||
| 22 | FORCE) | ||
| 23 | endif() | ||
| 24 | message(STATUS "cmake version ${CMAKE_VERSION}") | ||
| 25 | -if(POLICY CMP0025) | ||
| 26 | - cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang | ||
| 27 | -endif() | ||
| 28 | if(POLICY CMP0042) | ||
| 29 | cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH | ||
| 30 | endif() | ||
| 31 | -if(POLICY CMP0054) | ||
| 32 | - cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted | ||
| 33 | -endif() | ||
| 34 | |||
| 35 | project (x265) | ||
| 36 | -cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8 | ||
| 37 | +cmake_minimum_required (VERSION 2.8.8...4.0) # OBJECT libraries require 2.8.8 | ||
| 38 | include(CheckIncludeFiles) | ||
| 39 | include(CheckFunctionExists) | ||
| 40 | include(CheckSymbolExists) | ||
| 41 | diff --git a/dynamicHDR10/CMakeLists.txt b/dynamicHDR10/CMakeLists.txt | ||
| 42 | index 22fb79d44..03c866b1f 100644 | ||
| 43 | --- a/dynamicHDR10/CMakeLists.txt | ||
| 44 | +++ b/dynamicHDR10/CMakeLists.txt | ||
| 45 | @@ -10,7 +10,7 @@ add_library(dynamicHDR10 OBJECT | ||
| 46 | hdr10plus.h | ||
| 47 | api.cpp ) | ||
| 48 | |||
| 49 | -cmake_minimum_required (VERSION 2.8.11) | ||
| 50 | +cmake_minimum_required (VERSION 2.8.11...4.0) | ||
| 51 | project(dynamicHDR10) | ||
| 52 | include(CheckIncludeFiles) | ||
| 53 | include(CheckFunctionExists) | ||
| 54 | @@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") | ||
| 55 | option(ENABLE_SHARED "Build shared library" OFF) | ||
| 56 | |||
| 57 | install(FILES hdr10plus.h DESTINATION include) | ||
| 58 | -endif() | ||
| 59 | \ No newline at end of file | ||
| 60 | +endif() | ||
| 61 | -- | ||
| 62 | 2.49.0 | ||
| 63 | |||
diff --git a/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb index dedc3aa4d3..79dd99220e 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb +++ b/meta-multimedia/recipes-multimedia/x265/x265_4.1.bb | |||
| @@ -11,6 +11,7 @@ DEPENDS = "nasm-native gnutls zlib libpcre numactl" | |||
| 11 | SRC_URI = " \ | 11 | SRC_URI = " \ |
| 12 | https://bitbucket.org/multicoreware/x265_git/downloads/x265_${PV}.tar.gz \ | 12 | https://bitbucket.org/multicoreware/x265_git/downloads/x265_${PV}.tar.gz \ |
| 13 | file://0001-json11.cpp-Include-cstdint.patch \ | 13 | file://0001-json11.cpp-Include-cstdint.patch \ |
| 14 | file://0001-x265-fix-build-with-cmake-4.patch \ | ||
| 14 | " | 15 | " |
| 15 | SRC_URI[sha256sum] = "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29" | 16 | SRC_URI[sha256sum] = "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29" |
| 16 | S = "${UNPACKDIR}/x265_${PV}/source" | 17 | S = "${UNPACKDIR}/x265_${PV}/source" |
