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

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>

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
index b45e7b24ea4be5be47103bfee54d4707223e761d..b9a8ae7066c6d3871ad9f33831144c066af226c7 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
@@ -69,15 +69,13 @@ if host_system == 'windows'
   libva_req = ['>= 1.18']
 endif
 
-libva_dep = dependency('libva', version: libva_req, required: va_required,
-    fallback: ['libva', 'libva_dep'])
+libva_dep = dependency('libva', version: libva_req, required: va_required)
 if not libva_dep.found()
   subdir_done()
 endif
 
 if host_system == 'linux'
-  libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required,
-      fallback: ['libva', 'libva_drm_dep'])
+  libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required)
   if not libva_drm_dep.found()
     subdir_done()
   endif
@@ -92,8 +90,7 @@ if host_system == 'linux'
   va_sources += va_linux_sources
   va_headers += va_linux_headers
 else
-  libva_win32_dep = dependency('libva-win32', version: libva_req, required: va_required,
-      fallback: ['libva', 'libva_win32_dep'])
+  libva_win32_dep = dependency('libva-win32', version: libva_req, required: va_required)
   if not libva_win32_dep.found()
     subdir_done()
   endif

diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
index 8f328d622f547d67a070896226d873d1cda6607c..3f83c9c977e42b64777ee6cdaf9f013f324d7b6a 100644 (file)
--- a/subprojects/gstreamer-vaapi/meson.build
+++ b/subprojects/gstreamer-vaapi/meson.build
@@ -79,14 +79,10 @@ else
   message('GStreamer debug system is enabled')
 endif
 
-libva_dep = dependency('libva', version: libva_req,
-  fallback : ['libva', 'libva_dep'])
-libva_drm_dep = dependency('libva-drm', version: libva_req,
-  required: get_option('drm'), fallback : ['libva', 'libva_drm_dep'])
-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'])
+libva_dep = dependency('libva', version: libva_req)
+libva_drm_dep = dependency('libva-drm', version: libva_req)
+libva_wayland_dep = dependency('libva-wayland', version: libva_req)
+libva_x11_dep = dependency('libva-x11', version: libva_req)
 
 libdrm_dep = dependency('libdrm', version: libdrm_req, required: get_option('drm'))
 libudev_dep = dependency('libudev', required: get_option('drm'))

diff --git a/subprojects/libva.wrap b/subprojects/libva.wrap
index 5207318afcff8b440bf682dd6a9aab99c06f0ed2..d99a2b33058512dc0d17549c0533a4be2d22e403 100644 (file)
--- a/subprojects/libva.wrap
+++ b/subprojects/libva.wrap
@@ -1,4 +1,12 @@
 [wrap-git]
-directory=libva
-url=https://github.com/intel/libva.git
-revision=1c58941b93ba5013c68e8370a408efd630275c9c
+directory = libva
+url = https://github.com/intel/libva.git
+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