[vlc-commits] [Git][videolan/vlc][master] package/apple: don't force building a newer CMake with prebuilt contribs

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
64d9fcb8 by Steve Lhomme at 2025-11-06T13:13:10+00:00
package/apple: don't force building a newer CMake with prebuilt contribs

In most builds where the contribs are prebuilt
we won't be using CMake. No need to build it for no reason.

- - - - -


1 changed file:

- extras/package/apple/build.sh


Changes:

=====================================
extras/package/apple/build.sh
=====================================
@@ -622,12 +622,14 @@ APPL_LIBTOOL=$(xcrun -f libtool) \
 echo "Building needed tools (if missing)"
 
 TOOLS_BOOTSTRAP=
-if [ "$VLC_HOST_OS" = "xros" ]; then
-    TOOLS_BOOTSTRAP="$TOOLS_BOOTSTRAP --min-cmake=3.28.0"
-fi
-# force local build until implicit C++ is properly supported, cmake 4.x is OK
-if [ "$VLC_HOST_OS" = "ios" ] || [ "$VLC_HOST_OS" = "tvos" ] || [ "$VLC_HOST_OS" = "watchos" ] || [ "$VLC_HOST_OS" = "xros" ]; then
-    TOOLS_BOOTSTRAP="$TOOLS_BOOTSTRAP --min-cmake=3.31.10"
+if [ "$VLC_USE_PREBUILT_CONTRIBS" = "0" ]; then
+    if [ "$VLC_HOST_OS" = "xros" ]; then
+        TOOLS_BOOTSTRAP="$TOOLS_BOOTSTRAP --min-cmake=3.28.0"
+    fi
+    # force local build until implicit C++ is properly supported, cmake 4.x is OK
+    if [ "$VLC_HOST_OS" = "ios" ] || [ "$VLC_HOST_OS" = "tvos" ] || [ "$VLC_HOST_OS" = "watchos" ] || [ "$VLC_HOST_OS" = "xros" ]; then
+        TOOLS_BOOTSTRAP="$TOOLS_BOOTSTRAP --min-cmake=3.31.10"
+    fi
 fi
 
 cd "$VLC_SRC_DIR/extras/tools" || abort_err "Failed cd to tools dir"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/64d9fcb84fa63ade7a5a40119a77d7b912b324de

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/64d9fcb84fa63ade7a5a40119a77d7b912b324de
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance