[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: Fix extra tool error message

[Steve Lhomme (@robUx4)]

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


Commits:
225996d2 by Romain Vimont at 2025-11-07T12:08:47+00:00
Fix extra tool error message

The error message is printed (among others) when the major versions
differ, not only when the current version is older than the expected
one, so "too old" may be incorrect.

Before:

> meson too old

After:

> meson incompatible version (expected 0.51.1, got 1.1.1)

(cherry picked from commit 8449690b0dbad24aff2f83b0213de810332e3883)

- - - - -
ed1baf0b by Steve Lhomme at 2025-11-07T12:08:47+00:00
package/macosx: show the SDK version used to build

(cherry picked from commit cb6ba2c39c485fcd46f6442b3bcccb9eff292de6)

- - - - -
ada86d53 by Steve Lhomme at 2025-11-07T12:08:47+00:00
package/macosx: use the same minimum version as the other scripts

The value is grabbed when calling env.build.sh.

(cherry picked from commit d6a636de2098f1f713da95b2a68de5da631eefad) (edited)
- 3.0 had the minimum to 10.7
- 4.0 also disabled x

- - - - -
7bec9f68 by Steve Lhomme at 2025-11-07T12:08:47+00:00
package/macos: build extras/tools with multiple threads

(cherry picked from commit 1deac746dcac43f53f52bbefe0b689ad89599291)

- - - - -


4 changed files:

- extras/package/macosx/build.sh
- extras/package/macosx/configure.sh
- extras/package/macosx/env.build.sh
- extras/tools/bootstrap


Changes:

=====================================
extras/package/macosx/build.sh
=====================================
@@ -224,7 +224,7 @@ if [ "$REBUILD" = "yes" ]; then
     make clean
     ./bootstrap > $out
 fi
-make > $out
+make -j$JOBS > $out
 spopd
 
 #


=====================================
extras/package/macosx/configure.sh
=====================================
@@ -23,7 +23,7 @@ OPTIONS="
         --disable-pulse
         --disable-sdl-image
         --disable-vnc
-        --with-macosx-version-min=10.7
+        --with-macosx-version-min=$MINIMAL_OSX_VERSION
 "
 
 export CFLAGS


=====================================
extras/package/macosx/env.build.sh
=====================================
@@ -161,8 +161,9 @@ vlcSetContribEnvironment() {
     if [ -z "$SDKROOT" ]; then
         export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
     fi
+    SDK_VERSION="$(xcrun --sdk $SDKROOT --show-sdk-version)"
 
-    echo "Setting contrib environment with minimum macOS version $MINIMAL_OSX_VERSION and SDK $SDKROOT"
+    echo "Setting contrib environment with minimum macOS version $MINIMAL_OSX_VERSION and SDK $SDK_VERSION at $SDKROOT"
 
     # Usually, VLCs contrib libraries do not support partial availability at runtime.
     # Forcing those errors has two reasons:


=====================================
extras/tools/bootstrap
=====================================
@@ -32,7 +32,7 @@ check_version() {
        [ "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor" ] ||
        [ "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor" -a "$needmicro" -gt "$gotmicro" ];
     then
-        echo "$1 too old"
+        echo "$1 incompatible version (expected $3, got $2)"
         NEEDED="$NEEDED $1"
     else
         FOUND="$FOUND $1"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8da71b5a45b8064a96bb576be86f03b8e17753b0...7bec9f68922e5ba1c31c00ff32be3e4645807f7d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8da71b5a45b8064a96bb576be86f03b8e17753b0...7bec9f68922e5ba1c31c00ff32be3e4645807f7d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance