Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
1e280fa9 by Steve Lhomme at 2026-02-04T15:03:28+00:00
contrib: x265: fix Apple arm64 cross-compilation
- - - - -
2 changed files:
- +
contrib/src/x265/0012-CMake-also-use-the-arch-flag-when-cross-compiling-ar.patch
- contrib/src/x265/rules.mak
Changes:
=====================================
contrib/src/x265/0012-CMake-also-use-the-arch-flag-when-cross-compiling-ar.patch
=====================================
@@ -0,0 +1,29 @@
+From e315733100aa08951d859e0ab16e66c1fc6c36be Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <[email protected]>
+Date: Tue, 3 Feb 2026 14:06:23 +0100
+Subject: [PATCH 12/12] CMake: also use the -arch flag when cross-compiling
+ arm64 for Apple
+
+Missing from 2bb9b9f83ac7d0daa919bbe73159d57a7d5a1a52.
+It's possible to cross-compile from x86_64 to arm64.
+---
+ source/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index a8e6b143b..a84df13bd 100755
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -735,6 +735,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})
+--
+2.50.1 (Apple Git-155)
+
=====================================
contrib/src/x265/rules.mak
=====================================
@@ -40,6 +40,7 @@ x265: x265_$(X265_VERSION).tar.gz .sum-x265
$(APPLY)
$(SRC)/x265/0001-CMake-verify-the-Neon-SVE-compiler-flags-can-be-used.patch
$(APPLY) $(SRC)/x265/0002-CMake-don-t-force-_WIN32_WINNT-values.patch
$(APPLY)
$(SRC)/x265/0010-CMake-allow-lpthread-in-the-pkg-config-file.patch
+ $(APPLY)
$(SRC)/x265/0012-CMake-also-use-the-arch-flag-when-cross-compiling-ar.patch
$(call pkg_static,"source/x265.pc.in")
$(MOVE)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/1e280fa92a81cc79c3281d77bb3f68e8fe424cc1
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/1e280fa92a81cc79c3281d77bb3f68e8fe424cc1
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
