genX_mfd: align hardware programming of Y Offset for V(Cr) with comment

[android-x86/hardware-intel-common-vaapi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 226df54..06c26e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # intel-vaapi-driver package version number
-m4_define([intel_vaapi_driver_major_version], [1])
-m4_define([intel_vaapi_driver_minor_version], [8])
-m4_define([intel_vaapi_driver_micro_version], [0])
+m4_define([intel_vaapi_driver_major_version], [2])
+m4_define([intel_vaapi_driver_minor_version], [0])
+m4_define([intel_vaapi_driver_micro_version], [1])
 m4_define([intel_vaapi_driver_pre_version],   [1])
 m4_define([intel_vaapi_driver_version],
           [intel_vaapi_driver_major_version.intel_vaapi_driver_minor_version.intel_vaapi_driver_micro_version])
@@ -10,17 +10,20 @@ m4_append([intel_vaapi_driver_version], intel_vaapi_driver_pre_version, [.pre])
 ])
 
 # libva minimum version requirement
-m4_define([va_api_version], [0.39.4])
-m4_define([libva_package_version], [1.7.3])
+m4_define([va_api_version], [1.0.0])
 
 # libdrm minimum version requirement
 m4_define([libdrm_version], [2.4.52])
 
+# Wayland minimum version requirement
+# 1.11.0 for wl_proxy_create_wrapper
+m4_define([wayland_api_version], [1.11.0])
+
 AC_PREREQ([2.57])
 AC_INIT([intel_vaapi_driver],
         [intel_vaapi_driver_version],
         [https://github.com/01org/intel-vaapi-driver/issues/new],
-        [intel_vaapi_driver],
+        [intel-vaapi-driver],
         [https://github.com/01org/intel-vaapi-driver])
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
@@ -142,6 +145,15 @@ AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC],
 
 dnl Check for VA/DRM API
 USE_X11="$enable_x11"
+
+dnl Check for X11
+if test "$enable_x11" = "yes"; then
+    USE_X11="yes"
+    PKG_CHECK_MODULES([X11],    [x11],    [:], [USE_X11="no"])
+    PKG_CHECK_MODULES([XEXT],   [xext],   [:], [USE_X11="no"])
+    PKG_CHECK_MODULES([XFIXES], [xfixes], [:], [USE_X11="no"])
+fi
+
 if test "$USE_X11" = "yes"; then
     PKG_CHECK_MODULES(LIBVA_X11_DEPS, [libva-x11],
       [AC_DEFINE([HAVE_VA_X11], [1], [Defined to 1 if VA/X11 API is enabled])],
@@ -188,7 +200,7 @@ if test "$enable_wayland" = "yes"; then
 
     if test "$USE_WAYLAND" = "yes"; then
 
-        PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client],
+        PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= wayland_api_version],
         [INCLUDES="$INCLUDES $WAYLAND_CLIENT_CFLAGS"], [:])
         WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
         AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,