Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
f54a0f96 by Steve Lhomme at 2026-02-04T16:22:02+01:00
contrib: set CMAKE_OSX_ARCHITECTURES
Similar to 5c84339e88aa8bf4452ec2a26a4d844482cfaa51 but
VLC 3 doesn't use a python script to generate the file.
- - - - -
4fcbee03 by Steve Lhomme at 2026-02-04T16:22:02+01:00
contrib: set CMAKE_OSX_DEPLOYMENT_TARGET
Similar to 092a90b66895f9c08a70b9e37af2ca5b4d7c7fc7 but
VLC 3 doesn't use a python script to generate the file.
- - - - -
085afe84 by Steve Lhomme at 2026-02-04T16:22:02+01:00
contrib: print the generated toolchain.cmake
This is helpful for debugging a broken build.
It was added to VLC 4 when using an external python script.
(a6dcec33242e131addf60fd8f324256fc2127bb5)
- - - - -
87c66d68 by Steve Lhomme at 2026-02-04T16:22:02+01:00
contrib: x265: fix Apple arm64 cross-compilation
(cherry picked from commit 1e280fa92a81cc79c3281d77bb3f68e8fe424cc1)
- - - - -
3 changed files:
- contrib/src/main.mak
- +
contrib/src/x265/0012-CMake-also-use-the-arch-flag-when-cross-compiling-ar.patch
- contrib/src/x265/rules.mak
Changes:
=====================================
contrib/src/main.mak
=====================================
@@ -667,6 +667,18 @@ ifdef HAVE_DARWIN_OS
echo "set(CMAKE_CXX_FLAGS \"$(CXXFLAGS)\")" >> $@
echo "set(CMAKE_LD_FLAGS \"$(LDFLAGS)\")" >> $@
echo "set(CMAKE_AR ar CACHE FILEPATH \"Archiver\")" >> $@
+ifeq ($(ARCH),aarch64)
+ echo "set(CMAKE_OSX_ARCHITECTURES \"arm64\" CACHE STRING \"\")" >> $@
+else
+ifeq ($(ARCH),arm)
+ echo "set(CMAKE_OSX_ARCHITECTURES \"armv7\" CACHE STRING \"\")" >> $@
+else
+ echo "set(CMAKE_OSX_ARCHITECTURES \"$(ARCH)\" CACHE STRING \"\")" >> $@
+endif
+endif
+ifdef VLC_DEPLOYMENT_TARGET
+ echo "set(CMAKE_OSX_DEPLOYMENT_TARGET \"$(VLC_DEPLOYMENT_TARGET)\"
CACHE STRING \"\")" >> $@
+endif
ifdef HAVE_IOS
echo "set(CMAKE_OSX_SYSROOT $(IOS_SDK))" >> $@
else
@@ -703,6 +715,7 @@ ifdef HAVE_CROSS_COMPILE
echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@
echo "set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> $@
endif
+ cat $@
MESON_SYSTEM_NAME =
ifdef HAVE_WIN32
=====================================
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
=====================================
@@ -32,6 +32,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/-/compare/614590f51fabef15f092332ed3ecd735c04ab895...87c66d6881da892267652c0422a9b3de516679fe
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/614590f51fabef15f092332ed3ecd735c04ab895...87c66d6881da892267652c0422a9b3de516679fe
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
