griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: macOS x265 libraries have wrong deployment target

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/123694
This commit is contained in:
Brecht Van Lommel
2024-06-24 20:02:20 +02:00
committed by Brecht Van Lommel
parent 0b7ae0c75a
commit 1ea70c3e3e
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build_files/build_environment/cmake/x265.cmake
View File

@@ -11,7 +11,7 @@ else()
endif()
if(BLENDER_PLATFORM_WINDOWS_ARM)
set(X265_WINDOWS_ARM64_ARGS
set(X265_COMMON_ARGS
-DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang-cl.exe
-DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang-cl.exe
-DCMAKE_C_FLAGS_INIT="--target=arm64-pc-windows-msvc"
@@ -22,8 +22,13 @@ if(BLENDER_PLATFORM_WINDOWS_ARM)
set(X265_12_PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/x265_12/src/external_x265_12 < ${PATCH_DIR}/x265_windows_arm.diff)
set(X265_10_PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/x265_10/src/external_x265_10 < ${PATCH_DIR}/x265_windows_arm.diff)
set(X265_PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/x265/src/external_x265 < ${PATCH_DIR}/x265_windows_arm.diff)
elseif(APPLE)
set(X265_COMMON_ARGS)
set(X265_12_PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/x265_12/src/external_x265_12 < ${PATCH_DIR}/x265_apple.diff)
set(X265_10_PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/x265_10/src/external_x265_10 < ${PATCH_DIR}/x265_apple.diff)
set(X265_PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/x265/src/external_x265 < ${PATCH_DIR}/x265_apple.diff)
else()
set(X265_WINDOWS_ARM64_ARGS)
set(X265_COMMON_ARGS)
set(X265_12_PATCH_COMMAND)
set(X265_10_PATCH_COMMAND)
set(X265_PATCH_COMMAND)
@@ -34,6 +39,7 @@ set(X265_12_EXTRA_ARGS
-DHIGH_BIT_DEPTH=ON
-DEXPORT_C_API=OFF
-DENABLE_SHARED=OFF
-DENABLE_PIC=ON
-DENABLE_CLI=OFF
-DMAIN12=ON
)
@@ -43,6 +49,7 @@ set(X265_10_EXTRA_ARGS
-DHIGH_BIT_DEPTH=ON
-DEXPORT_C_API=OFF
-DENABLE_SHARED=OFF
-DENABLE_PIC=ON
-DENABLE_CLI=OFF
)
@@ -77,7 +84,7 @@ ExternalProject_Add(external_x265_12
CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
SOURCE_SUBDIR source
PATCH_COMMAND ${X265_12_PATCH_COMMAND}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/x265_12 ${DEFAULT_CMAKE_FLAGS} ${X265_WINDOWS_ARM64_ARGS} ${X265_12_EXTRA_ARGS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/x265_12 ${DEFAULT_CMAKE_FLAGS} ${X265_COMMON_ARGS} ${X265_12_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/x265_12
)
@@ -89,7 +96,7 @@ ExternalProject_Add(external_x265_10
CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
SOURCE_SUBDIR source
PATCH_COMMAND ${X265_10_PATCH_COMMAND}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/x265_10 ${DEFAULT_CMAKE_FLAGS} ${X265_WINDOWS_ARM64_ARGS} ${X265_10_EXTRA_ARGS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/x265_10 ${DEFAULT_CMAKE_FLAGS} ${X265_COMMON_ARGS} ${X265_10_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/x265_10
)
@@ -102,7 +109,7 @@ ExternalProject_Add(external_x265
SOURCE_SUBDIR source
PATCH_COMMAND ${X265_PATCH_COMMAND}
LIST_SEPARATOR ^^
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/x265 ${DEFAULT_CMAKE_FLAGS} ${X265_WINDOWS_ARM64_ARGS} ${X265_EXTRA_ARGS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/x265 ${DEFAULT_CMAKE_FLAGS} ${X265_COMMON_ARGS} ${X265_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/x265
)

15
build_files/build_environment/patches/x265_apple.diff Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index ab5ddfe..50e9a05 100755
--- a/source/CMakeLists.txt
--- b/source/CMakeLists.txt
@@ -478,6 +478,10 @@ if(ARM64)
endif()
endif(ARM64)
+if(APPLE)
+ list(APPEND ASM_FLAGS -isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
+endif()
+
option(WARNINGS_AS_ERRORS "Stop compiles on first warning" OFF)
if(WARNINGS_AS_ERRORS)
if(GCC)

2
lib/macos_arm64

Submodule lib/macos_arm64 updated: 51156893b6...76e0973343

2
lib/macos_x64

Submodule lib/macos_x64 updated: 6e5ad8679f...265d4afd0a