[vlc-commits] [Git][videolan/vlc][master] 2 commits: meson: install vlc.mo files in locale/ on Windows

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
08fa209d by Steve Lhomme at 2026-09-14T14:22:28+00:00
meson: install vlc.mo files in locale/ on Windows

Otherwise use 'localedir'

- - - - -
330b4e71 by Steve Lhomme at 2026-09-14T14:22:28+00:00
meson: disable vlc-qt-check on Windows, OS/2, iOS, tvOS, visionOS

As in autotools.

- - - - -


3 changed files:

- meson.build
- modules/meson.build
- po/meson.build


Changes:

=====================================
meson.build
=====================================
@@ -206,23 +206,6 @@ else
     foundation_dep = []
 endif
 
-# Gettext
-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
-    if intl_dep.found()
-        cdata.set('HAVE_GETTEXT', 1)
-        cdata.set('ENABLE_NLS', 1)
-
-        subdir('po')
-    endif
-else
-    intl_dep = declare_dependency()
-endif
-
 # Domain name i18n support via GNU libidn
 idn_dep = dependency('libidn', required: false)
 if idn_dep.found()
@@ -1030,7 +1013,6 @@ vlc_pkg_suffix = meson.project_name().to_lower()
 
 sysdatadir_path = prefix_path / get_option('datadir')
 pkgdatadir_path = sysdatadir_path / vlc_pkg_suffix
-localedir_path = prefix_path / get_option('localedir')
 if host_system == 'windows'
     libdir_path = prefix_path
     pkglibdir_path = libdir_path / vlc_pkg_suffix
@@ -1041,6 +1023,7 @@ if host_system == 'windows'
     libexecdir_path = prefix_path
     pkglibexecdir_path = prefix_path
     vlccore_lib_path = prefix_path / 'sdk/lib'
+    localedir_path = prefix_path / 'locale'
 else
     libdir_path = prefix_path / get_option('libdir')
     pkglibdir_path = libdir_path / vlc_pkg_suffix
@@ -1051,6 +1034,7 @@ else
     libexecdir_path = prefix_path / get_option('libexecdir')
     pkglibexecdir_path = libexecdir_path / vlc_pkg_suffix
     vlccore_lib_path = prefix_path / 'lib' / vlc_pkg_suffix
+    localedir_path = prefix_path / get_option('localedir')
 endif
 
 cdata.set_quoted('LIBDIR', libdir_path)
@@ -1061,6 +1045,23 @@ cdata.set_quoted('SYSDATADIR', sysdatadir_path)
 cdata.set_quoted('PKGDATADIR', pkgdatadir_path)
 cdata.set_quoted('LOCALEDIR', localedir_path)
 
+# Gettext
+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
+    if intl_dep.found()
+        cdata.set('HAVE_GETTEXT', 1)
+        cdata.set('ENABLE_NLS', 1)
+
+        subdir('po')
+    endif
+else
+    intl_dep = declare_dependency()
+endif
+
 gen_vlc_about = find_program('buildsystem/gen-vlc-about.py')
 vlc_about = custom_target('vlc_about.h',
                         input:   ['COPYING', 'THANKS', 'AUTHORS'],


=====================================
modules/meson.build
=====================================
@@ -382,12 +382,13 @@ endif
 # in the modules folder, not in gui/qt/ subfolder as
 # vlc-static would not find it there.
 if get_option('qt').allowed() and qt6_dep.found()
+    enable_qt_check = host_system not in ['windows', 'os/2', 'ios', 'tvos', 'visionos']
     executable('vlc-qt-check',
         files('gui/qt/vlc-qt-check.cpp'),
         dependencies: [qt6_dep, qt_extra_deps],
         include_directories: [vlc_include_dirs],
-        build_by_default: true,
-        install: true,
+        build_by_default: enable_qt_check,
+        install: enable_qt_check,
         install_dir: pkglibexecdir_path,
         c_args : qt_extra_flags,
         cpp_args : qt_extra_flags,


=====================================
po/meson.build
=====================================
@@ -15,4 +15,5 @@ i18n.gettext(vlc_package_name,
 		'--keyword=_PNS:1c,2',
 		'--add-comments=xgettext:',
 		'--from-code=UTF-8',
-	])
+	],
+	install_dir: localedir_path)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c7d20a71e2138905a7d18604afdae329f4a2b2dc...330b4e71516ae1b1d0104b8c9db411a1a550f067

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