From 33888bf534400d3ea3ad7f4c9041ed835076fcc0 Mon Sep 17 00:00:00 2001 From: Scott D Phillips Date: Thu, 27 Apr 2017 22:55:27 -0700 Subject: [PATCH] build: Require libva < 0.99.0 libva >= 0.99.0 is not currently supported by gstreamer-vaapi, so fail to configure instead of failing late in the build. This libva is bundled in msdk[1] and it is ahead in time with respect the official and open source libva[2]. GStreamer-VAAPI only supports the latter for now. 1. https://software.intel.com/en-us/media-sdk/download 2. https://github.com/01org/libva/ https://bugzilla.gnome.org/show_bug.cgi?id=781866 --- configure.ac | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7362061530..312815910b 100644 --- a/configure.ac +++ b/configure.ac @@ -484,7 +484,7 @@ dnl -- VA-API -- dnl --------------------------------------------------------------------------- dnl Core API -PKG_CHECK_MODULES([LIBVA], [libva >= $VAAPI_REQ]) +PKG_CHECK_MODULES([LIBVA], [libva >= $VAAPI_REQ libva < 0.99.0]) VA_VERSION_STR=`$PKG_CONFIG --modversion libva` VA_DRIVERS_PATH=`$PKG_CONFIG --variable=driverdir libva` AC_DEFINE_UNQUOTED([VA_DRIVERS_PATH], ["$VA_DRIVERS_PATH"], diff --git a/meson.build b/meson.build index dd1ca68091..70f0bbeb91 100644 --- a/meson.build +++ b/meson.build @@ -37,7 +37,7 @@ gstcodecparsers_dep = dependency('gstreamer-codecparsers-1.0', version : gst_req gstgl_dep = dependency('gstreamer-gl-1.0', version : gst_req, fallback : ['gst-plugins-bad', 'gstgl_dep'], required: false) gmodule_dep = dependency('gmodule-2.0', required: false) -libva_dep = dependency('libva', version: '>= 0.30.4') +libva_dep = dependency('libva', version: ['>= 0.30.4', '< 0.99.0']) libva_drm_dep = dependency('libva-drm', version: '>= 0.33.0', required: false) libva_wayland_dep = dependency('libva-wayland', version: '>= 0.33.0', required: false)