mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-07 07:55:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Don't use fallback: kwarg for libva deps

Browse source 
This will cause a fallback even when the `va` option is `auto`, not
giving the user a chance to provide the dependency via the system, and
likely building this feature unnecessarily.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7760>
This commit is contained in:
Nirbheek Chauhan 2024-05-27 18:50:23 +05:30 committed by Backport Bot
parent 7ae9cf8136
commit d88db7ea2a
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
View file

@ -69,15 +69,13 @@ if host_system == 'windows'
libva_req = ['>= 1.18'] libva_req = ['>= 1.18']
endif endif
libva_dep = dependency('libva', version: libva_req, required: va_required, libva_dep = dependency('libva', version: libva_req, required: va_required)
fallback: ['libva', 'libva_dep'])
if not libva_dep.found() if not libva_dep.found()
subdir_done() subdir_done()
endif endif
if host_system == 'linux' if host_system == 'linux'
libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required, libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required)
fallback: ['libva', 'libva_drm_dep'])
if not libva_drm_dep.found() if not libva_drm_dep.found()
subdir_done() subdir_done()
endif endif
@ -92,8 +90,7 @@ if host_system == 'linux'
va_sources += va_linux_sources va_sources += va_linux_sources
va_headers += va_linux_headers va_headers += va_linux_headers
else else
libva_win32_dep = dependency('libva-win32', version: libva_req, required: va_required, libva_win32_dep = dependency('libva-win32', version: libva_req, required: va_required)
fallback: ['libva', 'libva_win32_dep'])
if not libva_win32_dep.found() if not libva_win32_dep.found()
subdir_done() subdir_done()
endif endif

12
subprojects/gstreamer-vaapi/meson.build
View file

@ -79,14 +79,10 @@ else
message('GStreamer debug system is enabled') message('GStreamer debug system is enabled')
endif endif
libva_dep = dependency('libva', version: libva_req, libva_dep = dependency('libva', version: libva_req)
fallback : ['libva', 'libva_dep']) libva_drm_dep = dependency('libva-drm', version: libva_req)
libva_drm_dep = dependency('libva-drm', version: libva_req, libva_wayland_dep = dependency('libva-wayland', version: libva_req)
required: get_option('drm'), fallback : ['libva', 'libva_drm_dep']) libva_x11_dep = dependency('libva-x11', version: libva_req)
libva_wayland_dep = dependency('libva-wayland', version: libva_req,
required: get_option('wayland'), fallback : ['libva', 'libva_wayland_dep'])
libva_x11_dep = dependency('libva-x11', version: libva_req,
required: get_option('x11'), fallback : ['libva', 'libva_x11_dep'])
libdrm_dep = dependency('libdrm', version: libdrm_req, required: get_option('drm')) libdrm_dep = dependency('libdrm', version: libdrm_req, required: get_option('drm'))
libudev_dep = dependency('libudev', required: get_option('drm')) libudev_dep = dependency('libudev', required: get_option('drm'))

14
subprojects/libva.wrap
View file

@ -1,4 +1,12 @@
[wrap-git] [wrap-git]
directory=libva directory = libva
url=https://github.com/intel/libva.git url = https://github.com/intel/libva.git
revision=1c58941b93ba5013c68e8370a408efd630275c9c revision = 1c58941b93ba5013c68e8370a408efd630275c9c
[provide]
libva = libva_dep
libva-drm = libva_drm_dep
libva-glx = libva_glx_dep
libva-wayland = libva_wayland_dep
libva-win32 = libva_win32_dep
libva-x11 = libva_x11_dep