diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-07-11 16:55:26 +0200 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-07-31 17:38:20 +0200 |
| commit | d8de1853555d473e863b76b99231c234f8d13c1d (patch) | |
| tree | 9543bde9d3297a60d65c6ae74374b22d5c247a0c | |
| parent | 8a7354380c62ce65fd20e2a491fff60582407844 (diff) | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 73b6473e..230f3522 100644 --- a/configure.ac +++ b/configure.ac @@ -505,7 +505,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 b958c6cd..10d2af0c 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) |