[vlc-commits] [Git][videolan/vlc][master] 4 commits: qt: meson: unfold gtk module with enabled: field

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0f392580 by Alexandre Janniaux at 2025-02-13T09:55:24+00:00
qt: meson: unfold gtk module with enabled: field

- - - - -
f52131d8 by Alexandre Janniaux at 2025-02-13T09:55:24+00:00
qt: meson: unfold gtk finding

The module will be disabled if gtk is not found

- - - - -
cf291069 by Alexandre Janniaux at 2025-02-13T09:55:24+00:00
qt: meson: rename some_sources into qt_plugin_sources

- - - - -
314914ce by Alexandre Janniaux at 2025-02-13T09:55:24+00:00
qt: meson: unfold qt_x11 module with enabled: field

- - - - -


1 changed file:

- modules/gui/qt/meson.build


Changes:

=====================================
modules/gui/qt/meson.build
=====================================
@@ -178,7 +178,7 @@ if (x11_dep.found() and
     )
 endif
 
-some_sources = files(
+qt_plugin_sources = files(
     'qt.cpp',
     'qt.hpp',
     'plugins.hpp',
@@ -507,7 +507,7 @@ some_sources = files(
 )
 
 if host_system == 'windows'
-    some_sources += files(
+    qt_plugin_sources += files(
         'maininterface/mainctx_win32.cpp',
         'maininterface/mainctx_win32.hpp',
         'maininterface/compositor_win7.cpp',
@@ -524,7 +524,7 @@ if (x11_dep.found() and
     xcb_dep.found() and
     xcb_damage_dep.found() and
     xcb_xfixes_dep.found())
-    some_sources += files(
+    qt_plugin_sources += files(
         'maininterface/compositor_x11.cpp',
         'maininterface/compositor_x11_renderclient.cpp',
         'maininterface/compositor_x11_renderwindow.cpp',
@@ -1064,36 +1064,35 @@ if qt6_dep.found()
         qt_cppargs += libcom_cppflags
     endif
 
-    if not (host_system in ['windows', 'darwin'])
-        #Qt GTK theme module
-        gtk_dep = dependency(
-            'gtk+-3.0',
-            version: '>=3.20',
-            required: get_option('qt_gtk')
-        )
+    #Qt GTK theme module
+    gtk_dep = dependency(
+        'gtk+-3.0',
+        version: '>=3.20',
+        required: get_option('qt_gtk').disable_auto_if(host_system in ['windows', 'darwin'])
+    )
 
-        if gtk_dep.found()
-            vlc_modules += {
-                'name' : 'qt_gtktheme',
-                'sources' : files(
-                    'style/gtkthemeprovider/gtk_compat.cpp',
-                    'style/gtkthemeprovider/gtk_compat.h',
-                    'style/gtkthemeprovider/gtkthemeprovider.cpp',
-                    'style/gtkthemeprovider/gtk_util.cpp',
-                    'style/gtkthemeprovider/gtk_util.h',
-                    'style/gtkthemeprovider/nav_button_provider_gtk.cpp',
-                    'style/gtkthemeprovider/nav_button_provider_gtk.h',
-                    'style/gtkthemeprovider/scoped_gobject.h'
-                ),
-                'dependencies' : [gtk_dep]
-            }
+    vlc_modules += {
+        'name' : 'qt_gtktheme',
+        'sources' : files(
+            'style/gtkthemeprovider/gtk_compat.cpp',
+            'style/gtkthemeprovider/gtk_compat.h',
+            'style/gtkthemeprovider/gtkthemeprovider.cpp',
+            'style/gtkthemeprovider/gtk_util.cpp',
+            'style/gtkthemeprovider/gtk_util.h',
+            'style/gtkthemeprovider/nav_button_provider_gtk.cpp',
+            'style/gtkthemeprovider/nav_button_provider_gtk.h',
+            'style/gtkthemeprovider/scoped_gobject.h'
+        ),
+        'dependencies' : [gtk_dep],
+        'enabled' : gtk_dep.found()
+    }
 
-            qt_extra_flags += '-DQT_HAS_GTK'
-        endif
+    if gtk_dep.found()
+        qt_extra_flags += '-DQT_HAS_GTK'
     endif
 
     if host_system == 'windows'
-        some_sources += files('maininterface/win32windoweffects_module.cpp',
+        qt_plugin_sources += files('maininterface/win32windoweffects_module.cpp',
                               'maininterface/win32windoweffects_module.hpp')
     else
         kf6WindowSystem_dep = dependency('KF6WindowSystem',
@@ -1115,22 +1114,21 @@ if qt6_dep.found()
         qt_extra_flags += '-DUPDATE_CHECK'
     endif
 
-    if (xcb_dep.found() and xcb_render_dep.found() and xcb_xfixes_dep.found())
 
-        vlc_modules += {
-            'name' : 'qt_x11',
-            'include_directories' : qt_include_dir,
-            'sources' : files(
-                'maininterface/qt_x11_plugin.c',
-                'maininterface/compositor_x11_utils.hpp',
-                'maininterface/compositor_x11_utils.cpp',
-                'util/csdmenu_module.h',
-                'util/csdmenu_x11.cpp',
-                'util/csdmenu_x11.h'
-            ),
-            'dependencies' : [xcb_dep, xcb_render_dep, xcb_xfixes_dep]
-        }
-    endif
+    vlc_modules += {
+        'name' : 'qt_x11',
+        'include_directories' : qt_include_dir,
+        'sources' : files(
+            'maininterface/qt_x11_plugin.c',
+            'maininterface/compositor_x11_utils.hpp',
+            'maininterface/compositor_x11_utils.cpp',
+            'util/csdmenu_module.h',
+            'util/csdmenu_x11.cpp',
+            'util/csdmenu_x11.h'
+        ),
+        'dependencies' : [xcb_dep, xcb_render_dep, xcb_xfixes_dep],
+        'enabled': xcb_dep.found() and xcb_render_dep.found() and xcb_xfixes_dep.found(),
+    }
 
     qt6pre_files = qt6.preprocess(ui_files: ui_sources,
         moc_headers: moc_headers,
@@ -1143,7 +1141,7 @@ if qt6_dep.found()
 
     vlc_modules += {
         'name' : 'qt',
-        'sources' : [qt6pre_files, qt6pre_qrc, shader_targets, shaders_processed, qt_sources, some_sources],
+        'sources' : [qt6pre_files, qt6pre_qrc, shader_targets, shaders_processed, qt_sources, qt_plugin_sources],
         'extra_files' : [shader_files],
         'dependencies' : [qt_extra_deps, qt6_dep, corefoundation_dep],
         'include_directories' : qt_include_dir,



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0c793839fc1579448273ff05f74d915c250e0777...314914cec8c823ccbcff51a58f1bb2cce64e42f4

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


VideoLAN code repository instance