From 0d710edb0684c5f461bf7d77814d559114d9179a Mon Sep 17 00:00:00 2001
From: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Date: Tue, 11 Jul 2017 16:55:26 +0200
Subject: build: blacklist only libva 0.99.0

Intel's MSDK uses libva 0.99.0, meanwhile open source libva bumped
its API version to 1.0.0. Thus we have to blacklist only the MSDK's
libva (0.99.0)

https://bugzilla.gnome.org/show_bug.cgi?id=784398
---
 configure.ac | 2 +-
 meson.build  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d6661df1..20dae220 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 libva < 0.99.0])
+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 5b41dda7..beb74e4f 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,7 @@ else
   gst_version_nano = 0
 endif
 
+libva_req = ['>= 0.30.4', '!= 0.99.0']
 glib_req = '>= 2.40.0'
 gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
 
@@ -37,7 +38,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', '< 0.99.0'])
+libva_dep = dependency('libva', version: libva_req)
 
 libva_drm_dep = dependency('libva-drm', version: '>= 0.33.0', required: false)
 libva_wayland_dep = dependency('libva-wayland', version: '>= 0.33.0', required: false)
-- 
cgit v1.2.3