From 4455d908eb61bccdfa3070afe279d0c28d1ef358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Mon, 7 Feb 2022 12:34:53 +0100 Subject: [PATCH] va: Fix and simplify build recipe. 1. Use api_version variable rather than static string. 2. Remove pkgconfig generation since currently the library is not installed, only used internally. 3. Rely on dependency "required" to abort compilation. Part-of: --- .../gst-plugins-bad/gst-libs/gst/va/meson.build | 15 ++------------- 1 file changed, 2 insertions(+), 13 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 11e53b9608..3ea0025944 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build @@ -23,18 +23,14 @@ if va_option.disabled() or host_system != 'linux' endif 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) -libdrm_dep = dependency('libdrm', required: false, fallback: ['libdrm', 'ext_libdrm']) if not (libva_dep.found() and libva_drm_dep.found()) - if va_option.enabled() - error('The va lib was enabled explicity, but required dependencies were not found.') - endif subdir_done() endif +libdrm_dep = dependency('libdrm', required: false, fallback: ['libdrm', 'ext_libdrm']) cdata.set10('HAVE_LIBDRM', libdrm_dep.found()) gstva = library('gstva-' + api_version, @@ -47,15 +43,8 @@ gstva = library('gstva-' + api_version, dependencies : [gst_dep, libva_dep, libva_drm_dep, libdrm_dep], ) -pkg_name = 'gstreamer-va-1.0' +pkg_name = 'gstreamer-va-' + api_version libraries += [[pkg_name, {'lib': gstva}]] -pkgconfig.generate(gstva, - libraries : gst_dep, - variables : pkgconfig_variables, - subdirs : pkgconfig_subdirs, - name : pkg_name, - description : 'GStreamer VA support', -) gstva_dep = declare_dependency(link_with : gstva, include_directories : [libsinc],