[vlc-commits] [Git][videolan/vlc][master] 4 commits: meson: add support for libintl from contribs

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d7515685 by Steve Lhomme at 2026-05-23T09:30:30+00:00
meson: add support for libintl from contribs

- - - - -
d6f7aaf9 by Steve Lhomme at 2026-05-23T09:30:30+00:00
package/win32: build VLC in verbose mode in nightlies

So we can compare the build calls between autotools and meson.

- - - - -
28c60ebd by Steve Lhomme at 2026-05-23T09:30:30+00:00
package/win32: add a way to generate nightly a 7z with meson

It doesn't match the pathes for an autotools build and the archive name/directory is different
but at least it has all the .exe and .dll files.

- - - - -
d0be77cd by Steve Lhomme at 2026-05-23T09:30:30+00:00
CI: add a win64 meson nightly target that should match the autotools nightly

- - - - -


3 changed files:

- extras/ci/gitlab-ci.yml
- extras/package/win32/build.sh
- meson.build


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -239,6 +239,14 @@ nightly-win64-llvm:
         <<: *variables-win64
         LIBVLC_EXTRA_BUILD_FLAGS: -D /
 
+nightly-win64-llvm-meson:
+    extends: .nightly-win-common
+    image:
+        name: $VLC_WIN_LLVM_MSVCRT_IMAGE
+    variables:
+        <<: *variables-win64
+        LIBVLC_EXTRA_BUILD_FLAGS: -D / -m
+
 nightly-win64-ucrt-llvm:
     extends: .nightly-win-common
     image:


=====================================
extras/package/win32/build.sh
=====================================
@@ -529,6 +529,12 @@ if [ -n "$INSTALL_PATH" ]; then
     CONFIGFLAGS="$CONFIGFLAGS --with-packagedir=$INSTALL_PATH"
 fi
 
+if [ "$INSTALLER" = "n" ]; then
+    COMPILEFLAGS="$COMPILEFLAGS V=1"
+    MCOMPILEFLAGS="$MCOMPILEFLAGS --verbose"
+fi
+
+
 if [ -n "$BUILD_MESON" ]; then
     # disable alarm() calls in tests. The timeout is handled by meson
     VLC_CFLAGS="$VLC_CFLAGS -Dalarm="
@@ -543,6 +549,10 @@ if [ -n "$BUILD_MESON" ]; then
     fi
 
     BUILD_PATH="$( pwd -P )"
+
+    # we don't want to install in <destdir>/usr/local, just <destdir>
+    MCONFIGFLAGS="$MCONFIGFLAGS --prefix=/"
+
     # generate the crossfile.meson
     test -e $SHORTARCH-meson/crossfile.meson && unlink $SHORTARCH-meson/crossfile.meson
     exec 3>$SHORTARCH-meson/crossfile.meson || return $?
@@ -587,8 +597,21 @@ if [ -n "$BUILD_MESON" ]; then
         --cross-file ${BUILD_PATH}/contrib/$CONTRIB_PREFIX/share/meson/cross/contrib.ini
 
     info "Compiling"
-    cd ${BUILD_PATH}/$SHORTARCH-meson
-    meson compile -j $JOBS
+    meson compile -j $JOBS -C ${BUILD_PATH}/$SHORTARCH-meson ${MCOMPILEFLAGS}
+
+    if [ -n "$INSTALL_PATH" ]; then
+        MINSTALLFLAGS="--destdir=$INSTALL_PATH $MINSTALLFLAGS"
+    else
+        MINSTALLFLAGS="--destdir=${BUILD_PATH}/$SHORTARCH-meson/vlc-$SHORTARCH $MINSTALLFLAGS"
+    fi
+
+    if [ "$INSTALLER" = "n" ]; then
+        meson install -C ${BUILD_PATH}/$SHORTARCH-meson ${MINSTALLFLAGS}
+        VLC_GIT_TAG="$(git describe --tags --long --match '?.*.*' --always)"
+        rm -rf ${BUILD_PATH}/$SHORTARCH-meson/vlc-$SHORTARCH-$VLC_GIT_TAG-debug.7z
+        cd ${BUILD_PATH}/$SHORTARCH-meson && \
+            7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$SHORTARCH-$VLC_GIT_TAG-debug.7z vlc-$SHORTARCH
+    fi
 else
     info "Bootstrapping"
     ${VLC_ROOT_PATH}/bootstrap
@@ -627,7 +650,7 @@ else
     ${SCRIPT_PATH}/configure.sh --host=$TRIPLET --with-contrib=../contrib/$CONTRIB_PREFIX "$WIXPATH" $CONFIGFLAGS
 
     info "Compiling"
-    make -j$JOBS
+    make -j$JOBS ${COMPILEFLAGS}
 
     if [ "$INSTALLER" = "n" ]; then
         make package-win32-debug-7zip


=====================================
meson.build
=====================================
@@ -217,7 +217,15 @@ else
 endif
 
 # Gettext
-intl_dep = dependency('intl', required: get_option('nls'))
+if get_option('nls').allowed()
+    intl_dep = dependency('intl', required: false)
+    if not intl_dep.found()
+        # check in contribs
+        intl_dep = cc.find_library('intl', dirs: contrib_libdir, required: get_option('nls'))
+    endif
+else
+    intl_dep = disabler()
+endif
 if intl_dep.found()
     cdata.set('HAVE_GETTEXT', 1)
     cdata.set('ENABLE_NLS', 1)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f5e78fa419a7ef3c4bbd26d32d6688c6b8820ad4...d0be77cd2c944e944220a04b2588bad08dbe627e

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