[vlc-commits] [Git][videolan/vlc][master] 3 commits: meson: add vlc_plugins_targets_array

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
117961f9 by Marvin Scholz at 2025-04-01T08:36:21+00:00
meson: add vlc_plugins_targets_array

This is a plain array variant of vlc_plugins_targets, given that
mesons dict unfortunately does not have a values() function.

It will be used in a future commit.

- - - - -
3d7f0d5f by Marvin Scholz at 2025-04-01T08:36:21+00:00
meson: reorder subdirs to have bin after modules

This is so that we can use vlc_plugins_targets_array in a future
commit in the bin meson.build file.

- - - - -
21b98cfa by Marvin Scholz at 2025-04-01T08:36:21+00:00
meson: depend plugin cache generation on all plugins

Use the new vlc_plugins_targets_array to depend on all plugins with the
plugins.dat custom target. This ensures the plugin cache is properly
regenerated when plugins change.

- - - - -


3 changed files:

- bin/meson.build
- meson.build
- modules/meson.build


Changes:

=====================================
bin/meson.build
=====================================
@@ -55,6 +55,7 @@ if build_vlc and (host_system != 'darwin' or have_osx) and not have_win_store an
         command: [vlc_cache_gen_dep, meson.global_build_root() / 'modules'],
         # ninja command will be `ninja bin/plugins.dat`
         output: 'plugins.dat',
+        depends: vlc_plugins_targets_array,
         build_by_default: not meson.is_cross_build(),
     )
 


=====================================
meson.build
=====================================
@@ -1101,12 +1101,12 @@ subdir('src')
 # LibVLC
 subdir('lib')
 
-# VLC binaries
-subdir('bin')
-
 # VLC plugins
 subdir('modules')
 
+# VLC binaries
+subdir('bin')
+
 # Generate config.h
 configure_file(input: 'config.h.meson',
   output: 'config.h',


=====================================
modules/meson.build
=====================================
@@ -378,6 +378,7 @@ endif
 # entry with the needed build definition for a VLC plugin.
 #
 vlc_plugins_targets = {}
+vlc_plugins_targets_array = []
 vlc_plugins_manifest = {}
 foreach module : vlc_modules
     if not module.has_key('name')
@@ -451,6 +452,7 @@ foreach module : vlc_modules
     vlc_plugins_targets += {
         module['name']: vlc_plugin
     }
+    vlc_plugins_targets_array += vlc_plugin
 endforeach
 
 # Rust/cargo common handling code



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/64b29135d4fd725edf350d7cae398b86479f2efc...21b98cfa247f5c7ce059135f0f9f27807221e059

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


VideoLAN code repository instance