From 5e4c152de4d495e5d7a61623e6bb11859de859d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Mon, 7 Feb 2022 11:27:57 +0100 Subject: [PATCH] va: Remove libgudev crumbs in library. 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: --- .../gst-plugins-bad/gst-libs/gst/va/meson.build | 1 - subprojects/gst-plugins-bad/sys/va/meson.build | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) 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 8149f67967..11e53b9608 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build @@ -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()) diff --git a/subprojects/gst-plugins-bad/sys/va/meson.build b/subprojects/gst-plugins-bad/sys/va/meson.build index 3f6baa02cc..fae5d68f8d 100644 --- a/subprojects/gst-plugins-bad/sys/va/meson.build +++ b/subprojects/gst-plugins-bad/sys/va/meson.build @@ -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')