[vlc-commits] [Git][videolan/vlc][master] 4 commits: package/win32: pass the CMake config to meson

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
6a636559 by Steve Lhomme at 2024-11-01T12:55:57+00:00
package/win32: pass the CMake config to meson

It may find contribs that way.

- - - - -
4ae9a475 by Steve Lhomme at 2024-11-01T12:55:57+00:00
package/win32: pass the cross-compilation qmake6 to meson

It's not able to find it by itself as it requires Qt6Core.pc.

- - - - -
e74df087 by Steve Lhomme at 2024-11-01T12:55:57+00:00
meson: don't look for ShaderTools for  qt

We don't use it directly. We detect qsb manually.
And we don't install the cross compiled version in contribs.

- - - - -
e239c723 by Steve Lhomme at 2024-11-01T12:55:57+00:00
meson: allow detecting the host bindir with qmake

- - - - -


3 changed files:

- extras/package/win32/build.sh
- modules/gui/qt/meson.build
- modules/gui/qt/shaders/meson.build


Changes:

=====================================
extras/package/win32/build.sh
=====================================
@@ -494,6 +494,7 @@ if [ -n "$BUILD_MESON" ]; then
         VLC_LDFLAGS="$VLC_LDFLAGS -Wl,-pdb="
     fi
 
+    BUILD_PATH="$( pwd -P )"
     # generate the crossfile.meson
     test -e $SHORTARCH-meson/crossfile.meson && unlink $SHORTARCH-meson/crossfile.meson
     exec 3>$SHORTARCH-meson/crossfile.meson || return $?
@@ -516,6 +517,10 @@ if [ -n "$BUILD_MESON" ]; then
     if [ -n "$VLC_EXE_WRAPPER" ]; then
         printf 'exe_wrapper = '"'"'%s'"'"'\n' "${VLC_EXE_WRAPPER}" >&3
     fi
+    printf 'cmake = '"'"'%s'"'"'\n' "$(command -v cmake)" >&3
+    if [ -z "$DISABLEGUI" ]; then
+        printf 'qmake6 = '"'"'%s'"'"'\n' "${BUILD_PATH}/contrib/${CONTRIB_PREFIX}/bin/qmake6" >&3
+    fi
 
     printf '\n[host_machine]\n' >&3
     printf 'system = '"'"'windows'"'"'\n' >&3
@@ -525,10 +530,10 @@ if [ -n "$BUILD_MESON" ]; then
 
 
     info "Configuring VLC"
-    BUILD_PATH="$( pwd -P )"
     cd ${VLC_ROOT_PATH}
     meson setup ${BUILD_PATH}/$SHORTARCH-meson \
         -Dc_args="${VLC_CFLAGS}" -Dc_link_args="${VLC_LDFLAGS}" -Dcpp_args="${VLC_CXXFLAGS}" -Dcpp_link_args="${VLC_LDFLAGS} -static-libstdc++" \
+        -Dcmake_prefix_path="${BUILD_PATH}/contrib/$CONTRIB_PREFIX" \
         $MCONFIGFLAGS \
         --cross-file ${BUILD_PATH}/$SHORTARCH-meson/crossfile.meson \
         --cross-file ${BUILD_PATH}/contrib/$CONTRIB_PREFIX/share/meson/cross/contrib.ini


=====================================
modules/gui/qt/meson.build
=====================================
@@ -17,7 +17,7 @@ qt6_dep = dependency('qt6',
     modules: [
         'Core', 'Gui', 'Widgets', 'Svg', 'Qml', 'QmlModels',
         'QuickLayouts', 'QuickTemplates2', 'QmlWorkerScript',
-        'Quick', 'QuickControls2', 'ShaderTools'
+        'Quick', 'QuickControls2'
         ],
     private_headers: true,
     required: get_option('qt'))


=====================================
modules/gui/qt/shaders/meson.build
=====================================
@@ -18,7 +18,7 @@ shader_sources = [
 
 shader_files = files(shader_sources)
 
-qt_bin_directory = qt6_dep.get_variable(pkgconfig: 'bindir')
+qt_bin_directory = qt6_dep.get_variable(pkgconfig: 'bindir', configtool: '-query QT_HOST_BINS')
 qsb = find_program(qt_bin_directory + '/qsb', required: true)
 
 qsb_params = ['--glsl=100 es,120,150', '--batchable', '-O']



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c7b046d8b3f6db3a6abc3c4766d22346de17fc8a...e239c723e90e9d5d07b8b3a39133404cc6f2bd56

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


VideoLAN code repository instance