[vlc-commits] [Git][videolan/vlc][master] Revert "Packaging: write our own meson crossfile for appleOS"

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
34c4f73e by Steve Lhomme at 2025-10-21T12:01:53+00:00
Revert "Packaging: write our own meson crossfile for appleOS"

The contribs already has a way to generate the crossfile.meson file with more features.
It also doesn't rewrite the file if it is the same, avoiding rebuilds of all meson-based contribs.

The main difference is the passing of -arch and -sysroot to the compiler. But these are
already passed as cflags and used for function tests. For example here is the call to
check for clock_gettime in dav1d using

> if cc.has_function('clock_gettime', prefix : '#include <time.h>', args : test_args)

Command line: `/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-I/Volumes/APFS/Programs/Videolabs/vlc/contrib/contrib-arm64-apple-iOS_9.0/dav1d/.
-I/Volumes/APFS/Programs/Videolabs/vlc/contrib/contrib-arm64-apple-iOS_9.0/dav1d/vlc_build/.
-I/Volumes/APFS/Programs/Videolabs/vlc/contrib/contrib-arm64-apple-iOS_9.0/dav1d/include/dav1d
-I/Volumes/APFS/Programs/Videolabs/vlc/contrib/contrib-arm64-apple-iOS_9.0/dav1d/vlc_build/include/dav1d
-I/Volumes/APFS/Programs/Videolabs/vlc/contrib/contrib-arm64-apple-iOS_9.0/dav1d/include
-I/Volumes/APFS/Programs/Videolabs/vlc/contrib/contrib-arm64-apple-iOS_9.0/dav1d/vlc_build/include
-I/Volumes/APFS/Programs/Videolabs/vlc/contrib/arm64-iphoneos/include /tmp/tmp4xnfmvv3/testfile.c -E -P
-mios-version-min=9.0 -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS26.0.sdk
-Werror=partial-availability
-fno-stack-check -g -O2 -P -O0 -Werror=implicit-function-declaration -std=c99` -> 0

This reverts commit 47cdb055b8435ba14bbf1f3db93c2dea55b7677c.

- - - - -


1 changed file:

- extras/package/apple/build.sh


Changes:

=====================================
extras/package/apple/build.sh
=====================================
@@ -432,46 +432,6 @@ write_config_mak()
     vlcSetSymbolEnvironment ac_var_to_export_ac_var >&3
 }
 
-# Write crossfile.meson for contribs
-# Globals:
-#   VLC_HOST_CC
-#   VLC_HOST_CXX
-#   VLC_HOST_AR
-#   VLC_HOST_STRIP
-#   VLC_APPLE_SDK_PATH
-#   VLC_HOST_ARCH
-write_crossfile_meson()
-{
-    local meson_host_arch=$VLC_HOST_ARCH
-    if [ $meson_host_arch = "arm64" ]; then
-        meson_host_arch="aarch64"
-    fi
-    echo "Creating crossfile.meson..."
-    test -e crossfile.meson && unlink crossfile.meson
-    exec 3>crossfile.meson || return $?
-
-    printf "# This file was automatically generated by the appleOS build script!\n\n" >&3
-    printf "[binaries]\n" >&3
-    printf "c = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
-    printf "cpp = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
-    printf "objc = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
-    printf "objcpp = ['%s', '-arch', '%s', '-isysroot', '%s']\n" "${VLC_HOST_CC}" "$VLC_HOST_ARCH" "$VLC_APPLE_SDK_PATH"  >&3
-    printf "ar = ['%s']\n" "${VLC_HOST_AR}" >&3
-    printf "strip = ['%s']\n" "${VLC_HOST_STRIP}" >&3
-    printf "pkgconfig = 'pkg-config'\n" >&3
-    printf "windres = 'windres'\n" >&3
-    printf "\n[properties]\n" >&3
-    printf "needs_exe_wrapper = true\n" >&3
-    printf "\n[host_machine]\n" >&3
-    printf "system = 'darwin'\n" >&3
-    printf "cpu_family = '%s'\n" "${meson_host_arch}" >&3
-    printf "endian = 'little'\n" >&3
-    printf "cpu = '%s'\n"  "${meson_host_arch}" >&3
-    printf "\n[cmake]\n" >&3
-    printf "CMAKE_C_COMPILER = '%s'\n" "${VLC_HOST_CC}" >&3
-    printf "CMAKE_CXX_COMPILER = '%s'\n" "${VLC_HOST_CXX}" >&3
-}
-
 # Generate the source file with the needed array for
 # the static VLC module list. This has to be compiled
 # and linked into the static library
@@ -696,9 +656,6 @@ mkdir -p "$VLC_CONTRIB_INSTALL_DIR"
 # Set flag to error on partial availability
 write_config_mak "-Werror=partial-availability"
 
-# Write crossfile-meson with flags for the build and compiler overrides
-write_crossfile_meson
-
 if [ "$VLC_USE_BITCODE" -gt "0" ]; then
     VLC_CONTRIB_OPTIONS+=( "--enable-bitcode" )
 fi



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/34c4f73ec7f783f1d85e65bdf42242df77c1a9c0

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


VideoLAN code repository instance