build: test: enable out-of-source building

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

diff --git a/configure.ac b/configure.ac
index 1612993..3f625f5 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], [1])
+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,20 +10,23 @@ 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.1.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])
+AM_INIT_AUTOMAKE([1.9 tar-ustar -Wno-portability])
 
 AC_CONFIG_HEADERS([src/config.h])
 
@@ -86,7 +89,7 @@ AC_SUBST(LIBVA_PACKAGE_VERSION)
 
 dnl Check for recent enough DRM
 LIBDRM_VERSION=libdrm_version
-PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
+PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION libdrm_intel])
 AC_SUBST(LIBDRM_VERSION)
 
 dnl Check for gen4asm
@@ -132,10 +135,6 @@ VA_MINOR_VERSION=`echo "$VA_VERSION" | cut -d'.' -f2`
 VA_MICRO_VERSION=`echo "$VA_VERSION" | cut -d'.' -f3`
 VA_VERSION_STR="$VA_VERSION"
 
-va_full_version_int=`expr ${VA_MAJOR_VERSION:-0} "*" 1000000 + \
-                          ${VA_MINOR_VERSION:-0} "*" 10000   + \
-                          ${VA_MICRO_VERSION:-0} "*" 100     + \
-                          0`
 VA_DRIVER_INIT_FUNC="__vaDriverInit_${VA_MAJOR_VERSION}_${VA_MINOR_VERSION}"
 AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC],
     [Define driver entry-point])
@@ -197,7 +196,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],,
@@ -216,6 +215,7 @@ AC_OUTPUT([
     src/shaders/brc/Makefile
     src/shaders/brc/bsw/Makefile
     src/shaders/brc/skl/Makefile
+    src/shaders/brc/cnl/Makefile
     src/shaders/h264/Makefile
     src/shaders/h264/ildb/Makefile
     src/shaders/h264/mc/Makefile