From 3c345e3a43bbf7a5000d7d29dcfa7fa8601361f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Thu, 17 Aug 2017 12:54:47 +0200
Subject: [PATCH] Revert "build: check for libva-2.0"

This reverts commit 8f2eb70803099d4b533ecc10fc259041d8714210.

https://bugzilla.gnome.org/show_bug.cgi?id=784398
---
 configure.ac      | 25 ++++++-------------------
 meson.build       | 27 ++++-----------------------
 meson_options.txt |  1 -
 3 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/configure.ac b/configure.ac
index efa7bdc..145e3b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,11 +120,6 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
   ["${srcdir}/gstreamer-vaapi.doap"],
   [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
 
-AC_ARG_WITH([libva],
-  [AS_HELP_STRING([--with-libva[[=VERSION]]],
-    [which version of libva use (1 or 2) @<:@default=check@:>@])],
-  [], [with_libva="check"])
-
 AC_ARG_ENABLE([encoders],
   AS_HELP_STRING([--enable-encoders],
     [enable video encoders @<:@default=yes@:>@]),
@@ -510,23 +505,15 @@ dnl -- VA-API                                                                --
 dnl ---------------------------------------------------------------------------
 
 dnl Core API
-LIBVA_VERSION=
-AS_CASE([$with_libva],
-  [2], [PKG_CHECK_MODULES([LIBVA], [libva-2.0 >= 1.0.0],
-          [LIBVA_VERSION="-2.0"])],
-  [1], [PKG_CHECK_MODULES([LIBVA], [libva >= $VAAPI_REQ libva != 0.99.0])],
-  [PKG_CHECK_MODULES([LIBVA], [libva-2.0 >= 1.0.0],
-          [LIBVA_VERSION="-2.0"],
-          [PKG_CHECK_MODULES([LIBVA], [libva >= $VAAPI_REQ libva != 0.99.0])])])
-
-VA_VERSION_STR=`$PKG_CONFIG --modversion libva$LIBVA_VERSION`
-VA_DRIVERS_PATH=`$PKG_CONFIG --variable=driverdir libva$LIBVA_VERSION`
+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"],
   [VA drivers path])
 
 dnl VA/DRM API
 if test $USE_DRM -eq 1; then
-  PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm$LIBVA_VERSION >= $VAAPI_DRM_REQ],
+  PKG_CHECK_MODULES([LIBVA_DRM], [libva-drm >= $VAAPI_DRM_REQ],
     [
       saved_CPPFLAGS="$CPPFLAGS"
       CPPFLAGS="$CPPFLAGS $LIBVA_DRM_CFLAGS"
@@ -537,7 +524,7 @@ fi
 
 dnl VA/X11 API
 if test $USE_X11 -eq 1; then
-  PKG_CHECK_MODULES(LIBVA_X11, [libva-x11$LIBVA_VERSION >= $VAAPI_X11_REQ],
+  PKG_CHECK_MODULES(LIBVA_X11, [libva-x11 >= $VAAPI_X11_REQ],
     [], [USE_X11=0])
 fi
 
@@ -908,7 +895,7 @@ fi
 
 dnl VA/Wayland API
 if test $USE_WAYLAND -eq 1; then
-  PKG_CHECK_MODULES([LIBVA_WAYLAND], [libva-wayland$LIBVA_VERSION >= $VAAPI_WLD_REQ],
+  PKG_CHECK_MODULES([LIBVA_WAYLAND], [libva-wayland >= $VAAPI_WLD_REQ],
     [], [USE_WAYLAND=0])
 fi
 
diff --git a/meson.build b/meson.build
index 310e61d..a6acda2 100644
--- a/meson.build
+++ b/meson.build
@@ -43,30 +43,11 @@ 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: libva_req)
 
-libva_version = ''
-if get_option('with_libva') == 'auto'
-  libva_dep = dependency('libva-2.0', required : false)
-  if not libva_dep.found()
-    libva_dep = dependency('libva', version: libva_req)
-  else
-    libva_version = '-2.0'
-  endif
-else
-  if get_option('with_libva') == '2'
-    libva_dep = dependency('libva-2.0')
-    libva_version = '-2.0'
-  else
-    libva_dep = dependency('libva', version: libva_req)
-  endif
-endif
-
-libva_drm_dep = dependency('libva-drm' + libva_version, version: '>= 0.33.0',
-    required: false)
-libva_wayland_dep = dependency('libva-wayland' + libva_version,
-    version: '>= 0.33.0', required: false)
-libva_x11_dep = dependency('libva-x11' + libva_version, version: '>= 0.31.0',
-    required: false)
+libva_drm_dep = dependency('libva-drm', version: '>= 0.33.0', required: false)
+libva_wayland_dep = dependency('libva-wayland', version: '>= 0.33.0', required: false)
+libva_x11_dep = dependency('libva-x11', version: '>= 0.31.0', required: false)
 libdrm_dep = dependency('libdrm', required: false)
 libudev_dep = dependency('libudev', required: false)
 egl_dep = dependency('egl', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index b411067..018f8bc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('with_libva', type : 'combo', choices : ['1', '2', 'auto'], value : 'auto')
 option('with_encoders', type : 'combo', choices : ['yes', 'no', 'auto'], value : 'auto')
 option('with_drm', type : 'combo', choices : ['yes', 'no', 'auto'], value : 'auto')
 option('with_x11', type : 'combo', choices : ['yes', 'no', 'auto'], value : 'auto')
-- 
2.7.4