X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.ac;h=b24405209a59a0c83412b6320d79b2936c0bd7e5;hb=5c47c33ad1dcfb4298054f7e8664dc910010d73f;hp=fb2d11aba0eaa16c1dc83c320e79772d47d8bfba;hpb=855194dd2933aec55d6db30371530b2b93382ff6;p=android-x86%2Fhardware-intel-common-libva.git

diff --git a/configure.ac b/configure.ac
index fb2d11a..b244052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,8 @@
 # - reset micro version to zero when minor version is incremented
 # - reset minor version to zero when major version is incremented
 m4_define([va_api_major_version], [0])
-m4_define([va_api_minor_version], [34])
-m4_define([va_api_micro_version], [0])
+m4_define([va_api_minor_version], [39])
+m4_define([va_api_micro_version], [4])
 
 m4_define([va_api_version],
           [va_api_major_version.va_api_minor_version.va_api_micro_version])
@@ -42,8 +42,8 @@ m4_define([va_api_version],
 # - reset micro version to zero when VA-API major or minor version is changed
 m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
 m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)])
-m4_define([libva_micro_version], [0])
-m4_define([libva_pre_version],   [0])
+m4_define([libva_micro_version], [3])
+m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],
           [libva_major_version.libva_minor_version.libva_micro_version])
@@ -273,15 +273,17 @@ if test "$enable_wayland" = "yes"; then
     PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version],
         [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 built])
     fi
 fi
-AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
-m4_ifdef([WAYLAND_SCANNER_RULES],
-    [WAYLAND_SCANNER_RULES(['$(top_srcdir)/va/wayland/protocol'])],
-    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
+AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
@@ -291,6 +293,11 @@ if test "$USE_DRM:$USE_X11:$USE_WAYLAND" = "no:no:no"; then
     AC_MSG_ERROR([Please select at least one backend (DRM, X11, Wayland)])
 fi
 
+# Define __vaDriverInit*() function name for dummy backend
+VA_DRIVER_INIT_FUNC="__vaDriverInit_${VA_API_MAJOR_VERSION}_${VA_API_MINOR_VERSION}"
+AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC],
+    [Defined to the versioned __vaDriverInit function name])
+
 AC_OUTPUT([
     Makefile
     debian.upstream/Makefile
@@ -324,9 +331,6 @@ debian.upstream/libva-x11.install.in
     test/decode/Makefile
     test/encode/Makefile
     test/putsurface/Makefile
-    test/v4l_h264/Makefile
-    test/v4l_h264/decode/Makefile
-    test/v4l_h264/encode/Makefile
     test/vainfo/Makefile
     va/Makefile
     va/drm/Makefile
@@ -334,7 +338,6 @@ debian.upstream/libva-x11.install.in
     va/glx/Makefile
     va/va_version.h
     va/wayland/Makefile
-    va/wayland/protocol/Makefile
     va/x11/Makefile
 ])