[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: aom: workaround for Xcode 12 SDK bug

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
8a5e203b by Marvin Scholz at 2026-09-14T18:34:12+02:00
contrib: aom: workaround for Xcode 12 SDK bug

- - - - -
4e3cd7f2 by Marvin Scholz at 2026-09-14T18:34:12+02:00
contrib: x265: workaround Xcode 12 SDK bug

Co-authored-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


4 changed files:

- + contrib/src/aom/0001-Work-around-broken-Xcode-12-SDK-which-doesn-t-correc.patch
- contrib/src/aom/rules.mak
- + contrib/src/x265/0001-Work-around-broken-Xcode-12-SDK-which-doesn-t-correc.patch
- contrib/src/x265/rules.mak


Changes:

=====================================
contrib/src/aom/0001-Work-around-broken-Xcode-12-SDK-which-doesn-t-correc.patch
=====================================
@@ -0,0 +1,33 @@
+From 4611d41a7c9ebcac286a69122f0d0006ec7d61f3 Mon Sep 17 00:00:00 2001
+From: Marvin Scholz <epirat07 at gmail.com>
+Date: Mon, 7 Sep 2026 23:38:55 +0200
+Subject: [PATCH] Work around broken Xcode 12 SDK which doesn't correctly
+ define vdotq_lane_s32 as returning signed vs. unsigned
+
+Co-authored-by: Steve Lhomme <robux4 at ycbcr.xyz>
+Change-Id: I84709659987eec504934101703bc7dffad6e78a6
+---
+ cmake/aom_configure.cmake | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/cmake/aom_configure.cmake b/cmake/aom_configure.cmake
+index d94c97beb6..eafe8cc16c 100644
+--- a/cmake/aom_configure.cmake
++++ b/cmake/aom_configure.cmake
+@@ -428,8 +428,13 @@ else()
+   # Do not allow implicit vector type conversions on Clang builds (this is
+   # already the default on GCC builds).
+   if(CMAKE_C_COMPILER_ID MATCHES "Clang")
++    if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "13")
++      # Work around broken Xcode 12 SDK
++      add_compiler_flag_if_supported("-flax-vector-conversions=integer")
++    else()
+     # Clang 8.0.1 (in Cygwin) doesn't support -flax-vector-conversions=none.
+     add_compiler_flag_if_supported("-flax-vector-conversions=none")
++    endif()
+   endif()
+ endif()
+ 
+-- 
+2.52.0.windows.1
+


=====================================
contrib/src/aom/rules.mak
=====================================
@@ -21,6 +21,7 @@ ifndef HAVE_WINSTORE
 	# disable Windows InitOnceBeginInitialize not compatible with XP
 	sed -i.orig 's,defined(_WIN32),0,' $(UNPACK_DIR)/aom_ports/aom_once.h
 endif
+	$(APPLY) $(SRC)/aom/0001-Work-around-broken-Xcode-12-SDK-which-doesn-t-correc.patch
 	$(MOVE)
 
 DEPS_aom =


=====================================
contrib/src/x265/0001-Work-around-broken-Xcode-12-SDK-which-doesn-t-correc.patch
=====================================
@@ -0,0 +1,38 @@
+From 14f718ec25aea06638c990b2f2a9dd277340623a Mon Sep 17 00:00:00 2001
+From: Marvin Scholz <epirat07 at gmail.com>
+Date: Tue, 8 Sep 2026 00:18:49 +0200
+Subject: [PATCH] Work around broken Xcode 12 SDK which doesn't correctly
+ define vdotq_lane_s32 as returning signed vs. unsigned
+
+---
+ source/CMakeLists.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 7a47a7bef..168b81669 100755
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -406,12 +406,20 @@ int main() { return 0; }")
+             add_definitions(-DHAVE_SVE2=1)
+         endif()
+         set(ARM_ARGS -O3)
++        if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "13")
++            # Workaround Xcode 12 SDK bug
++            check_cxx_compiler_flag(-flax-vector-conversions=integer CC_HAS_FLAX_VEC_CONV_INT)
++            if(CC_HAS_FLAX_VEC_CONV_INT)
++                set(ARM_ARGS ${ARM_ARGS} -flax-vector-conversions=integer)
++            endif()
++        else()
+         # Do not allow implicit vector type conversions in Clang builds (this
+         # is already the default in GCC builds).
+         check_cxx_compiler_flag(-flax-vector-conversions=none CC_HAS_FLAX_VEC_CONV_NONE)
+         if(CC_HAS_FLAX_VEC_CONV_NONE)
+             set(ARM_ARGS ${ARM_ARGS} -flax-vector-conversions=none)
+         endif()
++        endif()
+     endif()
+     if(ENABLE_PIC)
+         list(APPEND ARM_ARGS -DPIC -fPIC)
+-- 
+2.52.0.windows.1
+


=====================================
contrib/src/x265/rules.mak
=====================================
@@ -33,6 +33,7 @@ x265: x265_$(X265_VERSION).tar.gz .sum-x265
 	$(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
+	$(APPLY) $(SRC)/x265/0001-Work-around-broken-Xcode-12-SDK-which-doesn-t-correc.patch
 	$(call pkg_static,"source/x265.pc.in")
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b667777390252023556ffbb5ebeaa0475f7ca28e...4e3cd7f22de52ce033272f8d1839ac9a0b85d3c0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b667777390252023556ffbb5ebeaa0475f7ca28e...4e3cd7f22de52ce033272f8d1839ac9a0b85d3c0
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help