Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
84ee1da4 by Olaf Hering at 2026-02-13T14:14:57+00:00
meson: install helpers into pkg specific libexec directory
Reuse the location which automake uses.
Signed-off-by: Olaf Hering <[email protected]>
- - - - -
6aa298e1 by Olaf Hering at 2026-02-13T14:14:57+00:00
meson: install headers into pkg specific directory
Reuse the location which automake uses.
Signed-off-by: Olaf Hering <[email protected]>
- - - - -
e874cef3 by Olaf Hering at 2026-02-13T14:14:57+00:00
meson: install plugins into pkg specific directory
Reuse the location which automake uses.
Signed-off-by: Olaf Hering <[email protected]>
- - - - -
8d200f10 by Olaf Hering at 2026-02-13T14:14:57+00:00
meson: install libraries required by plugins into libdir
The location which automake uses can not be used at the moment
because plugins built by meson lack the RUNPATH property.
Signed-off-by: Olaf Hering <[email protected]>
- - - - -
4 changed files:
- bin/meson.build
- include/meson.build
- modules/meson.build
- modules/video_output/meson.build
Changes:
=====================================
bin/meson.build
=====================================
@@ -47,6 +47,8 @@ if build_vlc and (host_system != 'darwin' or have_osx) and
not have_win_store an
['cachegen.c'],
link_with: [vlc_libcompat, libvlc],
include_directories: [vlc_include_dirs],
+ install: true,
+ install_dir: pkglibexecdir_path,
)
plugins_dat = custom_target('plugins.dat',
@@ -73,7 +75,7 @@ if build_vlc and (host_system != 'darwin' or have_osx) and
not have_win_store an
include_directories: [vlc_include_dirs],
dependencies: vlc_deps,
install: true,
- install_dir: get_option('libexecdir'),
+ install_dir: pkglibexecdir_path,
win_subsystem: 'windows'
)
@@ -84,7 +86,7 @@ if build_vlc and (host_system != 'darwin' or have_osx) and
not have_win_store an
dependencies: vlc_deps,
c_args: [vlc_top_builddir_def, vlc_top_srcdir_def],
objc_args: [vlc_top_builddir_def, vlc_top_srcdir_def],
- install_dir: get_option('libexecdir'),
+ install_dir: pkglibexecdir_path,
win_subsystem: 'windows'
)
=====================================
include/meson.build
=====================================
@@ -14,7 +14,7 @@ install_headers(
'vlc/libvlc_renderer_discoverer.h',
'vlc/libvlc_version.h',
'vlc/libvlc_video.h',
- subdir: 'vlc')
+ subdir: vlc_pkg_suffix)
# Install VLC plugin headers
install_headers(
@@ -120,4 +120,4 @@ install_headers(
'vlc_window.h',
'vlc_xlib.h',
'vlc_xml.h',
- subdir: 'vlc/plugins')
+ subdir: vlc_pkg_suffix / 'plugins')
=====================================
modules/meson.build
=====================================
@@ -169,6 +169,8 @@ if pipewire_dep.found()
include_directories: [include_directories('audio_output'),
vlc_include_dirs],
dependencies: [libvlccore_dep, pipewire_dep],
link_with: [vlc_libcompat],
+ install: true,
+ install_dir: libdir_path,
)
else
libvlc_pipewire = disabler()
@@ -181,6 +183,8 @@ if pulse_dep.found()
include_directories: [include_directories('audio_output'),
vlc_include_dirs],
dependencies: [libvlccore_dep, pulse_dep],
link_with: [vlc_libcompat],
+ install: true,
+ install_dir: libdir_path,
)
else
libvlc_pulse = disabler()
@@ -380,7 +384,7 @@ if qt6_dep.found()
include_directories: [vlc_include_dirs],
build_by_default: true,
install: true,
- install_dir: get_option('libexecdir'),
+ install_dir: pkglibexecdir_path,
c_args : qt_extra_flags,
cpp_args : qt_extra_flags,
link_args : qt_link_args,
@@ -471,7 +475,7 @@ foreach module : vlc_modules
extra_files: module.get('extra_files', []),
build_by_default: true,
install: true,
- install_dir: get_option('libdir') / 'vlc/plugins',
+ install_dir: pkglibdir_path / 'plugins',
kwargs: kwargs,
shortname: shortname,
)
=====================================
modules/video_output/meson.build
=====================================
@@ -132,7 +132,10 @@ if xcb_dep.found()
vlc_xcb_events_lib = library('vlc_xcb_events',
files('xcb/events.c'),
include_directories: [vlc_include_dirs],
- dependencies: [xcb_dep, libvlccore_dep])
+ dependencies: [xcb_dep, libvlccore_dep],
+ install: true,
+ install_dir: libdir_path,
+ )
if xcb_randr_dep.found() and xproto_dep.found()
vlc_modules += {
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/f431ac1b58356fc97e6564adf14243d1b3fdbbbf...8d200f10bea968a44d8ee4d6d234a8005a02b5e5
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/f431ac1b58356fc97e6564adf14243d1b3fdbbbf...8d200f10bea968a44d8ee4d6d234a8005a02b5e5
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
