From 5d9fc8fdca655ee3a6749421d18feff17c5f45fe Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 14 Sep 2026 18:52:17 -0400 Subject: Fix build Signed-off-by: Andrew Opalach --- src/codec/ffmpeg/meson.build | 2 +- src/fruits/cmv/create_icon.sh | 2 ++ src/fruits/cmv/meson.build | 5 ++++- src/fruits/cmv/sink.png | Bin 0 -> 11802 bytes src/portal/meson.build | 2 +- src/render/meson.build | 2 +- subprojects/packagefiles/libcdio-paranoia/meson.build | 3 +-- subprojects/packagefiles/libdvdcss/meson.build | 2 +- subprojects/packagefiles/libdvdnav/meson.build | 2 +- subprojects/packagefiles/libdvdread/meson.build | 2 +- 10 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 src/fruits/cmv/sink.png diff --git a/src/codec/ffmpeg/meson.build b/src/codec/ffmpeg/meson.build index 401c93a..3bf7d29 100644 --- a/src/codec/ffmpeg/meson.build +++ b/src/codec/ffmpeg/meson.build @@ -43,7 +43,7 @@ if not ffmpeg_force_fallback libavutil = dependency('libavutil', required: false, allow_fallback: false) endif if libavutil.found() - ffmpeg_version_string = run_command('sh', join_paths(meson.current_source_dir(), 'version.sh'), check: true).stdout().strip() + ffmpeg_version_string = run_command('sh', join_paths(meson.current_source_dir(), 'version.sh')).stdout().strip() if ffmpeg_version_string == '(unknown)' ffmpeg_version_string = libavutil_version_map[libavutil.version().split('.')[0]] + '.x' endif diff --git a/src/fruits/cmv/create_icon.sh b/src/fruits/cmv/create_icon.sh index 08aa8eb..4592e81 100755 --- a/src/fruits/cmv/create_icon.sh +++ b/src/fruits/cmv/create_icon.sh @@ -1,4 +1,6 @@ #! /usr/bin/env sh +cd $1 for size in {16,32,64,128}; do magick sink.png -resize $sizex$size -set filename:f "%[t]-%[w]x%[h]" "%[filename:f].png" done +cp sink.png sink-256x256.png diff --git a/src/fruits/cmv/meson.build b/src/fruits/cmv/meson.build index a9eda61..8eece7b 100644 --- a/src/fruits/cmv/meson.build +++ b/src/fruits/cmv/meson.build @@ -26,9 +26,12 @@ elif is_windows endif endif -install_data(join_paths(meson.source_root(), 'package/sink.desktop'), install_tag: 'xdg', +install_data(join_paths(meson.project_source_root(), 'package/sink.desktop'), install_tag: 'xdg', install_dir: join_paths(get_option('datadir'), 'applications')) +cmv_dir = meson.current_source_dir() +run_command('sh', join_paths(cmv_dir, 'create_icon.sh'), cmv_dir) + foreach size: ['16x16', '32x32', '64x64', '128x128', '256x256'] icon_dir = join_paths(get_option('datadir'), 'icons', 'hicolor', size, 'apps') install_data('sink-' + size + '.png', install_tag: 'xdg', diff --git a/src/fruits/cmv/sink.png b/src/fruits/cmv/sink.png new file mode 100644 index 0000000..bc9dcd9 Binary files /dev/null and b/src/fruits/cmv/sink.png differ diff --git a/src/portal/meson.build b/src/portal/meson.build index e87b588..8acf0e2 100644 --- a/src/portal/meson.build +++ b/src/portal/meson.build @@ -8,7 +8,7 @@ portal_deps = [] portal_args = ['-DCAMU_HAVE_PORTAL'] cpy_dir = join_paths(meson.current_source_dir(), 'cpy') -run_command('sh', join_paths(cpy_dir, 'build.sh'), cpy_dir, check: false) +run_command('sh', join_paths(cpy_dir, 'build.sh'), cpy_dir) python3_embed = import('python').find_installation('python3').dependency(embed: true) portal_deps += [python3_embed] diff --git a/src/render/meson.build b/src/render/meson.build index 3cbca4c..fb49723 100644 --- a/src/render/meson.build +++ b/src/render/meson.build @@ -88,7 +88,7 @@ elif get_option('renderer') == 'libplacebo' if spirv_optimizer spirv_tools_opts = cmake.subproject_options() spirv_tools_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : cmake_reltype }) - spirv_tools_opts.add_cmake_defines({ 'SPIRV-Headers_SOURCE_DIR': meson.source_root() + '/subprojects/SPIRV-Headers-b824a46' }) + spirv_tools_opts.add_cmake_defines({ 'SPIRV-Headers_SOURCE_DIR': meson.global_source_root() + '/subprojects/SPIRV-Headers-b824a46' }) spirv_tools_opts.add_cmake_defines({ 'ENABLE_EXCEPTIONS_ON_MSVC': false }) spirv_tools_proj = cmake.subproject('SPIRV-Tools', options: spirv_tools_opts) spirv_tools = spirv_tools_proj.dependency('SPIRV-Tools-static') diff --git a/subprojects/packagefiles/libcdio-paranoia/meson.build b/subprojects/packagefiles/libcdio-paranoia/meson.build index c8ee719..f7d39c7 100644 --- a/subprojects/packagefiles/libcdio-paranoia/meson.build +++ b/subprojects/packagefiles/libcdio-paranoia/meson.build @@ -2,8 +2,7 @@ project('libcdio-paranoia', 'c', version: 'git-384f4da', meson_version: '>=0.57. ext_proj = import('unstable-external_project') -# @TODO: Couldn't this work for shaderc? -run_command('autoreconf', '-fi', check: true) +run_command('autoreconf', '-fi') proj = ext_proj.add_project('configure', configure_options: [ diff --git a/subprojects/packagefiles/libdvdcss/meson.build b/subprojects/packagefiles/libdvdcss/meson.build index caa0deb..ed15638 100644 --- a/subprojects/packagefiles/libdvdcss/meson.build +++ b/subprojects/packagefiles/libdvdcss/meson.build @@ -2,7 +2,7 @@ project('libdvdcss', 'c', version: 'git-d0b6a29', meson_version: '>=0.57.0') ext_proj = import('unstable-external_project') -run_command('autoreconf', '-fi', check: true) +run_command('autoreconf', '-fi') proj = ext_proj.add_project('configure', configure_options: [ diff --git a/subprojects/packagefiles/libdvdnav/meson.build b/subprojects/packagefiles/libdvdnav/meson.build index 3d220da..dff9a2a 100644 --- a/subprojects/packagefiles/libdvdnav/meson.build +++ b/subprojects/packagefiles/libdvdnav/meson.build @@ -2,7 +2,7 @@ project('libdvdnav', 'c', version: 'git-9831fe0', meson_version: '>=0.57.0') ext_proj = import('unstable-external_project') -run_command('autoreconf', '-fi', check: true) +run_command('autoreconf', '-fi') proj = ext_proj.add_project('configure', configure_options: [ diff --git a/subprojects/packagefiles/libdvdread/meson.build b/subprojects/packagefiles/libdvdread/meson.build index 8511017..40d19cb 100644 --- a/subprojects/packagefiles/libdvdread/meson.build +++ b/subprojects/packagefiles/libdvdread/meson.build @@ -2,7 +2,7 @@ project('libdvdread', 'c', version: 'git-ba2227b', meson_version: '>=0.57.0') ext_proj = import('unstable-external_project') -run_command('autoreconf', '-fi', check: true) +run_command('autoreconf', '-fi') proj = ext_proj.add_project('configure', configure_options: [ -- cgit v1.2.3-101-g0448