Merge branch 'vaapi-ext' into staging-work

[profile/ivi/vaapi-intel-driver.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4fc1dfc..d29c4b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # intel-driver package version number
 m4_define([intel_driver_major_version], [1])
 m4_define([intel_driver_minor_version], [0])
-m4_define([intel_driver_micro_version], [15])
+m4_define([intel_driver_micro_version], [16])
 m4_define([intel_driver_pre_version],   [1])
 m4_define([intel_driver_version],
           [intel_driver_major_version.intel_driver_minor_version.intel_driver_micro_version])
@@ -60,6 +60,7 @@ AC_SUBST(LIBDRM_VERSION)
 dnl Check for gen4asm
 PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no])
 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+AC_PATH_PROG([GEN4ASM], [intel-gen4asm])
 
 dnl Check for VA-API
 PKG_CHECK_MODULES(LIBVA_DEPS,    [libva])
@@ -88,6 +89,28 @@ fi
 AC_MSG_RESULT([$LIBVA_DRIVERS_PATH])
 AC_SUBST(LIBVA_DRIVERS_PATH)
 
+dnl Check for JPEG decoding API
+AC_CACHE_CHECK([for JPEG decoding API], ac_cv_have_jpeg_decoding_api, [
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $LIBVA_DEPS_CFLAGS"
+    saved_LIBS="$LIBS"
+    LIBS="$CFLAGS $LIBVA_DEPS_LIBS"
+    AC_TRY_COMPILE(
+        [#include <va/va.h>],
+        [VAPictureParameterBufferJPEG pic_param;
+         VASliceParameterBufferJPEG slice_param;
+         VAIQMatrixBufferJPEG iq_matrix;],
+        [ac_cv_have_jpeg_decoding_api="yes"],
+        [ac_cv_have_jpeg_decoding_api="no"]
+    )
+    CFLAGS="$saved_CFLAGS"
+    LIBS="$saved_LIBS"
+])
+if test "$ac_cv_have_jpeg_decoding_api" = "yes"; then
+    AC_DEFINE(HAVE_JPEG_DECODING, 1,
+        [Defined to 1 if VA-API exposes JPEG decoding])
+fi
+
 AC_OUTPUT([
     Makefile
     debian.upstream/Makefile 
@@ -102,6 +125,7 @@ AC_OUTPUT([
     src/shaders/post_processing/gen5_6/Makefile
     src/shaders/post_processing/gen7/Makefile
     src/shaders/render/Makefile
+    src/shaders/utils/Makefile
     src/shaders/vme/Makefile
 ])