mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
ae29b86dc4
Release notes:
4.1: https://mailman.videolan.org/pipermail/x265-devel/2024-November/014095.html
4.0: https://mailman.videolan.org/pipermail/x265-devel/2024-September/013940.html
3.6: https://mailman.videolan.org/pipermail/x265-devel/2024-April/013664.html
Rebased patch 0001 and removed patch 0002 due to upstream commit
4bf31dc15f
Added patches 0002 & 0003 to fix build with CMake 4.x.
Added patch 0004 and adjusted _CONF_OPTS to fix non-NEON build.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From 51ae8e922bcc4586ad4710812072289af91492a8 Mon Sep 17 00:00:00 2001
|
|
From: yaswanthsastry <yaswanth.sastry@multicorewareinc.com>
|
|
Date: Mon, 7 Apr 2025 11:27:36 +0530
|
|
Subject: [PATCH] Fix for CMake Build Errors in MacOS
|
|
|
|
Upstream: https://bitbucket.org/multicoreware/x265_git/commits/51ae8e922bcc4586ad4710812072289af91492a8
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
source/CMakeLists.txt | 15 +++++++--------
|
|
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
|
index 4f5b3ed82..7183fd3ce 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 NEW) # 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 NEW) # 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")
|
|
@@ -740,6 +736,9 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
|
|
if(ARM OR CROSS_COMPILE_ARM)
|
|
# compile ARM 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/arm/${ASM})
|
|
list(APPEND ASM_SRCS ${ASM_SRC})
|
|
--
|
|
2.51.0
|
|
|