diff --git a/package-lock.cmake b/package-lock.cmake index b163b2e04..c8c4bf9a5 100644 --- a/package-lock.cmake +++ b/package-lock.cmake @@ -173,7 +173,7 @@ CPMDeclarePackage(x264 # x265 # renovate: datasource=github-tags depName=Multicorewareinc/x265 -set(X265_TAG 4.1) +set(X265_TAG 4.2) file(GLOB X265_PATCHES CONFIGURE_DEPENDS "${PATCH_DIRECTORY}/x265_git/*.patch") CPMDeclarePackage(x265 NAME x265 diff --git a/patches/FFmpeg/x265_git/01-cmake-minimum_required.patch b/patches/FFmpeg/x265_git/01-cmake-minimum_required.patch deleted file mode 100644 index e5c33f7a0..000000000 --- a/patches/FFmpeg/x265_git/01-cmake-minimum_required.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 5c6dda9e8..5a94ac804 100755 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -6,18 +6,14 @@ 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) - 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 - include(CheckIncludeFiles) - include(CheckFunctionExists) - include(CheckSymbolExists) -@@ -168,7 +164,7 @@ if(APPLE) - add_definitions(-DMACOS=1) - endif() - --if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") -+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") - set(CLANG 1) - endif() - if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") -@@ -736,6 +732,9 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY) - elseif(ARM64 OR CROSS_COMPILE_ARM64) - # compile ARM64 arch asm files here - enable_language(ASM) -+ if(APPLE) -+ set(ARM_ARGS ${ARM_ARGS} -arch ${CMAKE_OSX_ARCHITECTURES}) -+ endif() - foreach(ASM ${ARM_ASMS}) - set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/aarch64/${ASM}) - list(APPEND ASM_SRCS ${ASM_SRC}) -diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt -index 22fb79d44..4243338c6 100644 ---- a/source/dynamicHDR10/CMakeLists.txt -+++ b/source/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) - project(dynamicHDR10) - include(CheckIncludeFiles) - include(CheckFunctionExists)