X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.ac;h=ed3ebdf9faa0039b139278c05aed8938a6ed4fab;hb=6d781dd5b9601cc45ee573b8363f05e8bf6195f7;hp=2de7cae3c830e99955d0a2e62c2fcfe5500779b8;hpb=121e70d34028c5caa24b587988dda4b6b1335bf8;p=android-x86%2Fhardware-intel-common-vaapi.git

diff --git a/configure.ac b/configure.ac
index 2de7cae..ed3ebdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # intel-driver package version number
 m4_define([intel_driver_major_version], [1])
-m4_define([intel_driver_minor_version], [2])
-m4_define([intel_driver_micro_version], [2])
-m4_define([intel_driver_pre_version],   [0])
+m4_define([intel_driver_minor_version], [8])
+m4_define([intel_driver_micro_version], [0])
+m4_define([intel_driver_pre_version],   [1])
 m4_define([intel_driver_version],
           [intel_driver_major_version.intel_driver_minor_version.intel_driver_micro_version])
 m4_if(intel_driver_pre_version, [0], [], [
@@ -10,11 +10,11 @@ m4_append([intel_driver_version], intel_driver_pre_version, [.pre])
 ])
 
 # libva minimum version requirement
-m4_define([va_api_version], [0.34])
-m4_define([libva_package_version], [1.2.0])
+m4_define([va_api_version], [0.39.4])
+m4_define([libva_package_version], [1.7.3])
 
 # libdrm minimum version requirement
-m4_define([libdrm_version], [2.4.45])
+m4_define([libdrm_version], [2.4.52])
 
 AC_PREREQ([2.57])
 AC_INIT([intel_driver], [intel_driver_version], [haihao.xiang@intel.com],
@@ -56,16 +56,27 @@ AC_ARG_ENABLE([wayland],
                     [build with VA/Wayland API support @<:@default=yes@:>@])],
     [], [enable_wayland="yes"])
 
+AC_ARG_ENABLE([hybrid-codec],
+    [AC_HELP_STRING([--enable-hybrid-codec],
+                    [build with hybrid codec support @<:@default=no@:>@])],
+    [], [enable_hybrid_codec="no"])
+
+AC_ARG_ENABLE([tests],
+    [AC_HELP_STRING([--enable-tests],
+                    [build tests @<:@default=no@:>@])],
+    [], [enable_tests="no"])
+
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
 AM_PROG_CC_C_O
-
+AC_PROG_CXX
 AC_C_BIGENDIAN
 AC_HEADER_STDC
 AC_SYS_LARGEFILE
 AC_CHECK_LIB([m], [sin])
 AC_CHECK_FUNCS([log2f])
+AC_CHECK_PROGS([PYTHON2], [python2 python])
 
 LIBVA_PACKAGE_VERSION=libva_package_version
 AC_SUBST(LIBVA_PACKAGE_VERSION)
@@ -76,9 +87,15 @@ PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
 AC_SUBST(LIBDRM_VERSION)
 
 dnl Check for gen4asm
-PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.3], [gen4asm=yes], [gen4asm=no])
-AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.9], [gen4asm=yes], [gen4asm=no])
 AC_PATH_PROG([GEN4ASM], [intel-gen4asm])
+AS_IF([test "x$GEN4ASM" = "x" ], [AM_CONDITIONAL(HAVE_GEN4ASM, false)],
+    [AM_CONDITIONAL(HAVE_GEN4ASM, [test x$gen4asm = xyes])])
+
+dnl Check for git
+AC_ARG_VAR([GIT], [Path to git program, if any])
+AC_PATH_PROG([GIT], [git])
+AM_CONDITIONAL([HAVE_GIT], [test -n "$GIT"])
 
 dnl Check for VA-API
 PKG_CHECK_MODULES(LIBVA_DEPS,     [libva >= va_api_version])
@@ -100,6 +117,12 @@ if test "$USE_DRM" = "yes"; then
 fi
 AM_CONDITIONAL(USE_DRM, test "$USE_DRM" = "yes")
 
+if test "$enable_hybrid_codec" = "yes"; then
+    AC_DEFINE([HAVE_HYBRID_CODEC], [1], [Defined to 1 if hybrid codec is needed])
+fi
+
+AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "yes")
+
 VA_VERSION=`$PKG_CONFIG --modversion libva`
 VA_MAJOR_VERSION=`echo "$VA_VERSION" | cut -d'.' -f1`
 VA_MINOR_VERSION=`echo "$VA_VERSION" | cut -d'.' -f2`
@@ -124,10 +147,13 @@ fi
 AM_CONDITIONAL(USE_X11, test "$USE_X11" = "yes")
 
 dnl Check for VA-API drivers path
-AC_MSG_CHECKING([for VA drivers path])
-LIBVA_DRIVERS_PATH=`$PKG_CONFIG libva --variable driverdir`
+AC_ARG_VAR(LIBVA_DRIVERS_PATH, [drivers install path])
 if test -z "$LIBVA_DRIVERS_PATH"; then
-    LIBVA_DRIVERS_PATH="/usr/lib/xorg/modules/drivers"
+    AC_MSG_CHECKING([for VA drivers path])
+    LIBVA_DRIVERS_PATH=`$PKG_CONFIG libva --variable driverdir`
+fi
+if test -z "$LIBVA_DRIVERS_PATH"; then
+    LIBVA_DRIVERS_PATH="${libdir}/xorg/modules/drivers"
 fi
 AC_MSG_RESULT([$LIBVA_DRIVERS_PATH])
 AC_SUBST(LIBVA_DRIVERS_PATH)
@@ -154,17 +180,21 @@ AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
 # Check for Wayland
 USE_WAYLAND="no"
 if test "$enable_wayland" = "yes"; then
-    PKG_CHECK_MODULES([WAYLAND], [wayland-client], [USE_WAYLAND="yes"], [:])
     PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland],
-        [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])],
-        [USE_WAYLAND="no"])
+        [USE_WAYLAND="yes"], [:])
+
+    if test "$USE_WAYLAND" = "yes"; then
+
+        WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
+        AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,
+                     [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
+
+        AC_DEFINE([HAVE_VA_WAYLAND], [1],
+                  [Defined to 1 if VA/Wayland API is enabled])
+    fi
 fi
 AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
-m4_ifdef([WAYLAND_SCANNER_RULES],
-    [WAYLAND_SCANNER_RULES(['$(top_srcdir)/src/wayland'])],
-    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
-
 AC_OUTPUT([
     Makefile
     debian.upstream/Makefile 
@@ -179,10 +209,12 @@ AC_OUTPUT([
     src/shaders/post_processing/gen5_6/Makefile
     src/shaders/post_processing/gen7/Makefile
     src/shaders/post_processing/gen75/Makefile
+    src/shaders/post_processing/gen8/Makefile
+    src/shaders/post_processing/gen9/Makefile
     src/shaders/render/Makefile
     src/shaders/utils/Makefile
     src/shaders/vme/Makefile
-    src/wayland/Makefile
+    test/Makefile
 ])
 
 dnl Print summary
@@ -197,4 +229,5 @@ echo
 echo VA-API version ................... : $VA_VERSION_STR
 echo VA-API drivers path .............. : $LIBVA_DRIVERS_PATH
 echo Windowing systems ................ : $BACKENDS
+echo Build tests ...................... : $enable_tests
 echo