va: Remove libgudev crumbs in library.
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>
Mon, 7 Feb 2022 10:27:57 +0000 (11:27 +0100)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Tue, 8 Feb 2022 16:22:42 +0000 (16:22 +0000)
In commit e699aaeb we moved linking of libgudev to the plugin rather
the library, because it's only used in the plugin. But the dependency
check is still done in library.

This patch removes the dependency check in library, and updates the
dependency check in plugin.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1650>

subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
subprojects/gst-plugins-bad/sys/va/meson.build

index 8149f67..11e53b9 100644 (file)
@@ -26,7 +26,6 @@ libva_req = ['>= 1.6']
 
 libva_dep = dependency('libva', version: libva_req, required: va_option)
 libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_option)
-libgudev_dep = dependency('gudev-1.0', required: va_option)
 libdrm_dep = dependency('libdrm', required: false, fallback: ['libdrm', 'ext_libdrm'])
 
 if not (libva_dep.found() and libva_drm_dep.found())
index 3f6baa0..fae5d68 100644 (file)
@@ -22,26 +22,17 @@ va_sources = [
   'vasurfaceimage.c',
 ]
 
-va_option = get_option('va')
-if va_option.disabled() or host_system != 'linux'
+if not gstva_dep.found()
   subdir_done()
 endif
 
 libgudev_dep = dependency('gudev-1.0', required: false)
-
-if not gstva_dep.found() or not libgudev_dep.found()
-  if va_option.enabled()
-    error('The va plugin was enabled explicity, but required dependencies were not found.')
-  endif
-  subdir_done()
-endif
+cdata.set10('HAVE_GUDEV', libgudev_dep.found())
 
 if libva_dep.version().version_compare('>= 1.8')
   va_sources += 'gstvaav1dec.c'
 endif
 
-cdata.set10('HAVE_GUDEV', libgudev_dep.found())
-
 driverdir = libva_dep.get_variable('driverdir', default_value: '')
 if driverdir == ''
   driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri')