[vlc-commits] [Git][videolan/vlc][master] 2 commits: package/win32: use the proper cpu_family in the meson crossfile

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0dfc3a83 by Steve Lhomme at 2026-09-19T07:29:31+00:00
package/win32: use the proper cpu_family in the meson crossfile

Fixes this warning:

> WARNING: Unknown CPU family i686, please report this at https://github.com/mesonbuild/meson/issues/new

Using values from https://mesonbuild.com/Reference-tables.html#cpu-families

The values are correct in the crossfile generated in the contribs.

- - - - -
3e5d7492 by Steve Lhomme at 2026-09-19T07:29:31+00:00
package/win32: map the system TRIPLET-luac to meson

If it's found on the system it won't be in `share/meson/cross/contrib.ini`.

- - - - -


1 changed file:

- extras/package/win32/build.sh


Changes:

=====================================
extras/package/win32/build.sh
=====================================
@@ -128,15 +128,19 @@ fi
 case $ARCH in
     x86_64)
         SHORTARCH="win64"
+        MESON_CPU_FAMILY="x86_64"
         ;;
     i686)
         SHORTARCH="win32"
+        MESON_CPU_FAMILY="x86"
         ;;
     aarch64)
         SHORTARCH="winarm64"
+        MESON_CPU_FAMILY="aarch64"
         ;;
     armv7)
         SHORTARCH="winarm"
+        MESON_CPU_FAMILY="arm"
         ;;
     *)
         usage
@@ -605,10 +609,13 @@ if [ -n "$BUILD_MESON" ]; then
     if [ -z "$DISABLEGUI" ]; then
         printf 'qmake6 = '"'"'%s'"'"'\n' "${BUILD_PATH}/contrib/${CONTRIB_PREFIX}/bin/qmake6" >&3
     fi
+    if [ -x "$(command -v ${CONTRIB_PREFIX}-luac)" ]; then
+        printf 'luac = '"'"'%s'"'"'\n' "$(command -v ${CONTRIB_PREFIX}-luac)" >&3
+    fi
 
     printf '\n[host_machine]\n' >&3
     printf 'system = '"'"'windows'"'"'\n' >&3
-    printf 'cpu_family = '"'"'%s'"'"'\n' "${ARCH}" >&3
+    printf 'cpu_family = '"'"'%s'"'"'\n' "${MESON_CPU_FAMILY}" >&3
     printf 'endian = '"'"'little'"'"'\n' >&3
     printf 'cpu = '"'"'%s'"'"'\n' "${ARCH}" >&3
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/cd37cf87249178970d07afa2671606a4979b1fda...3e5d7492a6294993419e997c8ac0ca8ae5746d94

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/cd37cf87249178970d07afa2671606a4979b1fda...3e5d7492a6294993419e997c8ac0ca8ae5746d94
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