system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-10-15 12:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Restructure vulkan dependency handling and assert headers

Browse source 
vulkan_headers was a workaround for distributions providing pkg-config information
without the headers. Replacing it with a more conventional have_vulkan
and assert header availability if the option vulkan is enabled.
This commit is contained in:
columbarius 2023-10-15 17:24:08 +02:00 committed by Wim Taymans
parent 82b2515af3
commit 6064e5087e
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
spa/meson.build
View file

@ -87,9 +87,14 @@ if get_option('spa-plugins').allowed()
endif
jack_dep = dependency('jack', version : '>= 1.9.10', required: get_option('jack'))
summary({'JACK2': jack_dep.found()}, bool_yn: true, section: 'Backend')
vulkan_dep = dependency('vulkan', disabler : true, version : '>= 1.1.69', required: get_option('vulkan'))
vulkan_headers = cc.has_header('vulkan/vulkan.h', dependencies : vulkan_dep)
#summary({'Vulkan': vulkan_headers}, bool_yn: true, section: 'Misc dependencies')
have_vulkan = false
vulkan_dep = dependency('vulkan', version : '>= 1.1.69', required: get_option('vulkan'))
if vulkan_dep.found()
have_vulkan = cc.has_header('vulkan/vulkan.h', dependencies : vulkan_dep)
assert((not get_option('vulkan').enabled()) or have_vulkan, 'Vulkan headers are missing')
endif
summary({'Vulkan': have_vulkan}, bool_yn: true, section: 'Misc dependencies')
libcamera_dep = dependency('libcamera', required: get_option('libcamera'))
summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend')

2
spa/plugins/meson.build
View file

@ -40,7 +40,7 @@ endif
if get_option('volume').allowed()
subdir('volume')
endif
if vulkan_headers
if have_vulkan
subdir('vulkan')
endif