From 0fa792393792a4ae455e138b16606afbc2533f10 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 11 Mar 2022 18:08:14 -0500 Subject: [PATCH] Meson: Set install_tag on some files Meson tries to guess the tag (runtime, devel, etc) for every installed file, but it cannot guess them all. There is a list at the end of meson-log.txt of files we need to tag manually. See https://mesonbuild.com/Installing.html#installation-tags. Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build | 1 + subprojects/gst-python/gi/overrides/meson.build | 3 ++- .../gstreamer/data/bash-completion/helpers/meson.build | 3 ++- subprojects/gstreamer/data/meson.build | 8 ++++++-- subprojects/gstreamer/libs/gst/helpers/meson.build | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build index b88e18cf3a..190de712d3 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build @@ -1012,6 +1012,7 @@ if build_gstgl configure_file(input : 'gstglconfig.h.meson', output : 'gstglconfig.h', install_dir : get_option('libdir') + '/gstreamer-1.0/include/gst/gl', + install_tag : 'devel', configuration : glconf) glib_mkenums = find_program('glib-mkenums') diff --git a/subprojects/gst-python/gi/overrides/meson.build b/subprojects/gst-python/gi/overrides/meson.build index 7c41c0ed9b..cac9a483cb 100644 --- a/subprojects/gst-python/gi/overrides/meson.build +++ b/subprojects/gst-python/gi/overrides/meson.build @@ -1,6 +1,7 @@ pysources = ['Gst.py', 'GstPbutils.py', 'GstVideo.py', 'GstAudio.py'] install_data(pysources, - install_dir: pygi_override_dir) + install_dir: pygi_override_dir, + install_tag: 'python-runtime') gstpython = python.extension_module('_gi_gst', sources: ['gstmodule.c'], diff --git a/subprojects/gstreamer/data/bash-completion/helpers/meson.build b/subprojects/gstreamer/data/bash-completion/helpers/meson.build index c5399bf287..c633a4b0a2 100644 --- a/subprojects/gstreamer/data/bash-completion/helpers/meson.build +++ b/subprojects/gstreamer/data/bash-completion/helpers/meson.build @@ -6,4 +6,5 @@ bash_helper_conf.set('GST_API_VERSION', apiversion) configure_file(input : 'gst.in', output : 'gst', install_dir : bash_helpers_dir, - configuration : bash_helper_conf) + configuration : bash_helper_conf, + install_tag : 'runtime') diff --git a/subprojects/gstreamer/data/meson.build b/subprojects/gstreamer/data/meson.build index c9130e029c..25f2643f09 100644 --- a/subprojects/gstreamer/data/meson.build +++ b/subprojects/gstreamer/data/meson.build @@ -1,5 +1,9 @@ if (bashcomp_found) subdir('bash-completion/helpers') - install_data('bash-completion/completions/gst-launch-1.0', install_dir : bash_completions_dir) - install_data('bash-completion/completions/gst-inspect-1.0', install_dir : bash_completions_dir) + install_data('bash-completion/completions/gst-launch-1.0', + install_dir : bash_completions_dir, + install_tag : 'runtime') + install_data('bash-completion/completions/gst-inspect-1.0', + install_dir : bash_completions_dir, + install_tag : 'runtime') endif diff --git a/subprojects/gstreamer/libs/gst/helpers/meson.build b/subprojects/gstreamer/libs/gst/helpers/meson.build index 6f7d7dade1..a6ca092c02 100644 --- a/subprojects/gstreamer/libs/gst/helpers/meson.build +++ b/subprojects/gstreamer/libs/gst/helpers/meson.build @@ -125,7 +125,8 @@ if have_ptp endif install_data(['gst_gdb.py', 'glib_gobject_helper.py'], - install_dir : join_paths(get_option('datadir'), 'gstreamer-@0@'.format(apiversion), 'gdb')) + install_dir : join_paths(get_option('datadir'), 'gstreamer-@0@'.format(apiversion), 'gdb'), + install_tag : 'devel') gdbconf = configuration_data() gdbconf.set('GST_API_VERSION', apiversion) @@ -143,4 +144,5 @@ endif configure_file(input : 'libgstreamer-gdb.py.in', output : 'libgstreamer-@0@.so.@1@-gdb.py'.format(apiversion, libversion), install_dir : gdb_install_dir, + install_tag : 'devel', configuration : gdbconf)