-
Simon McVittie authored
Since !173, we have been able to create symbolic links to graphics drivers anywhere on the filesystem, but that didn't mean the graphics driver would necessarily be usable, because the directory containing it would not necessarily be visible in the container. Add these directories to the list of directories to be "exported". Manual test (Debian on on Intel hardware, adjust as required for others): * Modify /usr/share/vulkan/icd.d/intel_icd.i686.json to use /opt/moved-from-usr/lib/i386-linux-gnu/libvulkan_intel.so * Move the real i386 libvulkan_intel.so to that location * ./run --verbose -- steam-runtime-system-info 2>&1 | tee container.log Resolves: #29 Resolves: https://github.com/ValveSoftware/steam-runtime/issues/313 Signed-off-by:
Simon McVittie <smcv@collabora.com>
Simon McVittie authoredSince !173, we have been able to create symbolic links to graphics drivers anywhere on the filesystem, but that didn't mean the graphics driver would necessarily be usable, because the directory containing it would not necessarily be visible in the container. Add these directories to the list of directories to be "exported". Manual test (Debian on on Intel hardware, adjust as required for others): * Modify /usr/share/vulkan/icd.d/intel_icd.i686.json to use /opt/moved-from-usr/lib/i386-linux-gnu/libvulkan_intel.so * Move the real i386 libvulkan_intel.so to that location * ./run --verbose -- steam-runtime-system-info 2>&1 | tee container.log Resolves: #29 Resolves: https://github.com/ValveSoftware/steam-runtime/issues/313 Signed-off-by:
Simon McVittie <smcv@collabora.com>
meson.build 6.64 KiB
# Copyright © 2019-2020 Collabora Ltd.
#
# SPDX-License-Identifier: MIT
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
conf_data = configuration_data()
conf_data.set_quoted('VERSION', version)
configure_file(
input : 'config.h.in',
output : '_pressure-vessel-config.h',
configuration : conf_data,
)
pv_dir = 'lib/pressure-vessel/relocatable'
pv_bindir = pv_dir + '/bin'
pv_rpath = bin_rpath + ':${ORIGIN}/../' + get_option('libdir')
pv_c_args = ['-include', '_pressure-vessel-config.h']
# This trips some warnings in the libglnx subproject but not in
# pressure-vessel itself
pv_warning_cflags = [
'-Wsign-compare',
]
scripts = [
'pressure-vessel-locale-gen',
'pressure-vessel-test-ui',
'pressure-vessel-unruntime',
]
foreach script : scripts
install_data(
script,
install_dir : pv_bindir,
)
endforeach
# Headers to scan for enum/flags types.
headers = [
'runtime.h',
]
launcher1 = gnome.gdbus_codegen(
'launcher1',
sources : 'com.steampowered.PressureVessel.Launcher1.xml',
interface_prefix : 'com.steampowered.PressureVessel.',
namespace : 'Pv',
)
enums = gnome.mkenums_simple(
'enumtypes',
sources : headers,
)
pressure_vessel_utils = static_library(
'pressure-vessel-utils',
sources : [
'bwrap-lock.c',
'bwrap-lock.h',
'elf-utils.c',
'elf-utils.h',
'flatpak-bwrap.c',
'flatpak-bwrap-private.h',
'flatpak-utils-base.c',
'flatpak-utils-base-private.h',
'flatpak-utils.c',
'flatpak-utils-private.h',
'tree-copy.c',
'tree-copy.h',
'utils.c',
'utils.h',
],
c_args : pv_c_args,
dependencies : [
threads,
gio_unix,
libelf,
libglnx_dep,
libsteamrt_static_dep,
],
include_directories : pv_include_dirs,
install: false,
)
pressure_vessel_utils_dep = declare_dependency(
link_with : pressure_vessel_utils,
sources : launcher1[1],
)
launcher_codegen = static_library(
'pressure-vessel-launcher-codegen',
sources : launcher1,
dependencies : [
gio_unix,
],
c_args : silence_gdbus_codegen_warnings + pv_c_args,
include_directories : pv_include_dirs,
install: false,
)
launcher_codegen_dep = declare_dependency(
link_with : launcher_codegen,
sources : launcher1[1],
)
executable(
'pressure-vessel-adverb',
sources : [
'adverb.c',
'wrap-interactive.c',
'wrap-interactive.h',
],
c_args : pv_c_args,
dependencies : [
pressure_vessel_utils_dep,
threads,
gio_unix,
libglnx_dep,
json_glib,
],
include_directories : pv_include_dirs,
install : true,
install_dir : pv_bindir,
build_rpath : pv_rpath,
install_rpath : pv_rpath,
)
executable(
'pressure-vessel-launch',
sources: [
'launch.c',
],
c_args : pv_c_args,
dependencies : [
pressure_vessel_utils_dep,
threads,
gio_unix,
libglnx_dep,
json_glib,
],
include_directories : pv_include_dirs,
install : true,
install_dir : pv_bindir,
build_rpath : pv_rpath,
install_rpath : pv_rpath,
)
executable(
'pressure-vessel-launcher',
sources: [
'launcher.c',
'portal-listener.c',
'portal-listener.h',
],
c_args : pv_c_args,
dependencies : [
launcher_codegen_dep,
pressure_vessel_utils_dep,
threads,
gio_unix,
libglnx_dep,
json_glib,
],
include_directories : pv_include_dirs,
install : true,
install_dir : pv_bindir,
build_rpath : pv_rpath,
install_rpath : pv_rpath,
)
executable(
'pressure-vessel-wrap',
sources : [
'bwrap.c',
'bwrap.h',
'exports.c',
'exports.h',
'flatpak-common-types-private.h',
'flatpak-context.c',
'flatpak-context-private.h',
'flatpak-exports.c',
'flatpak-exports-private.h',
'flatpak-run.c',
'flatpak-run-private.h',
'runtime.c',
'runtime.h',
'wrap.c',
] + enums,
c_args : pv_c_args,
dependencies : [
pressure_vessel_utils_dep,
gio_unix,
xau,
libglnx_dep,
json_glib,
],
include_directories : pv_include_dirs,
install : true,
install_dir : pv_bindir,
build_rpath : pv_rpath,
install_rpath : pv_rpath,
)
executable(
'pressure-vessel-try-setlocale',
sources : [
'try-setlocale.c',
],
c_args : pv_c_args,
include_directories : pv_include_dirs,
install : true,
install_dir : pv_bindir,
)
if get_option('srcdir') != ''
conf_data = configuration_data()
conf_data.set('prefix', get_option('prefix'))
conf_data.set('pv_dir', pv_dir)
conf_data.set('python', python.path())
conf_data.set('sh', sh.path())
conf_data.set('srcdir', get_option('srcdir'))
conf_data.set('version', version)
install_data(
configure_file(
input : 'build-relocatable-install.in',
output : 'pressure-vessel-build-relocatable-install',
configuration : conf_data,
),
install_dir : pv_bindir,
install_mode : 'rwxr-xr-x',
)
meson.add_install_script(
python.path(),
meson.current_source_dir() / 'copy-source-code.py',
'--srcdir', meson.source_root(),
'--prefix', get_option('prefix'),
'--pressure-vessel-dir', pv_dir,
'--set-version', version,
get_option('srcdir'),
)
endif
if get_option('man')
foreach tool : [
'adverb',
'launch',
'launcher',
'locale-gen',
'test-ui',
'try-setlocale',
'unruntime',
'wrap',
]
custom_target(
tool + '.1',
build_by_default : true,
command : [
pandoc,
'-s',
'-o', '@OUTPUT@',
'-f', pandoc_markdown_nosmart,
'-t', 'man',
'@INPUT@',
],
input : tool + '.1.md',
output : 'pressure-vessel-' + tool + '.1',
install : true,
install_dir : join_paths(
get_option('prefix'),
get_option('mandir'),
'man1',
),
)
endforeach
endif
# vim:set sw=2 sts=2 et: