X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.ac;h=ef3634556ff8ee1f97faa1ebb2d979dbbd83fe49;hb=c26a187cdff82dc5a360676ef05e6f6d761c2a0a;hp=ca20d2eb3cff24da55d3a28f9f18fef2fc7110cd;hpb=cdf8636d5fc5b1558570fede347e1599e0d6af3d;p=android-x86%2Fhardware-intel-common-libva.git diff --git a/configure.ac b/configure.ac index ca20d2e..ef36345 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ # - 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], [36]) +m4_define([va_api_minor_version], [40]) m4_define([va_api_micro_version], [0]) m4_define([va_api_version], @@ -42,7 +42,7 @@ 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], [1]) +m4_define([libva_micro_version], [4]) m4_define([libva_pre_version], [1]) m4_define([libva_version], @@ -78,10 +78,16 @@ m4_define([libva_lt_age], m4_define([libdrm_version], [2.4]) # Wayland minimum version number -m4_define([wayland_api_version], [1.0.0]) +# 1.11.0 for wl_proxy_create_wrapper +m4_define([wayland_api_version], [1.11.0]) AC_PREREQ(2.57) -AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva) +AC_INIT([libva], + [libva_version], + [https://github.com/01org/libva/issues/new], + [libva], + [https://github.com/01org/libva]) + AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -148,11 +154,10 @@ AC_ARG_ENABLE([wayland], [build with VA/Wayland API support @<:@default=yes@:>@])], [], [enable_wayland="yes"]) -AC_ARG_ENABLE(dummy-driver, - [AC_HELP_STRING([--enable-dummy-driver], - [build dummy video driver @<:@default=yes@:>@])], - [], [enable_dummy_driver="yes"]) -AM_CONDITIONAL(BUILD_DUMMY_DRIVER, test x$enable_dummy_driver = xyes) +AC_ARG_ENABLE([va-messaging], + [AC_HELP_STRING([--enable-va-messaging], + [build with va info and error messaging @<:@default=yes@:>@])], + [], [enable_va_messaging="yes"]) AC_ARG_WITH(drivers-path, [AC_HELP_STRING([--with-drivers-path=[[path]]], @@ -167,6 +172,7 @@ AC_PROG_LIBTOOL AC_PROG_CC AC_PROG_CXX AM_PROG_CC_C_O +AC_PROG_SED PKG_PROG_PKG_CONFIG AC_HEADER_STDC @@ -181,6 +187,11 @@ if test "$enable_docs" = "yes"; then fi AM_CONDITIONAL(ENABLE_DOCS, test "$enable_docs" = "yes") +# Check for va messaging +if test "$enable_va_messaging" = "yes"; then + AC_DEFINE([ENABLE_VA_MESSAGING], [1], [Defined to 1 if va messaging is needed]) +fi + # Check for __attribute__((visibility())) AC_CACHE_CHECK([whether __attribute__((visibility())) is supported], ac_cv_have_gnuc_visibility_attribute, @@ -273,15 +284,20 @@ 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]) + if test "x$WAYLAND_SCANNER" = "x"; then + AC_MSG_ERROR([wayland-scanner not found: Install it or use --disable-wayland]) + fi + 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,30 +307,9 @@ 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 - debian.upstream/changelog - debian.upstream/control - debian.upstream/libva$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva.install.in - debian.upstream/libva-drm$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-drm.install.in - debian.upstream/libva-egl$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-egl.install.in - debian.upstream/libva-glx$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-glx.install.in - debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-wayland.install.in - debian.upstream/libva-x11-$LIBVA_MAJOR_VERSION.install:\ -debian.upstream/libva-x11.install.in doc/Makefile - dummy_drv_video/Makefile pkgconfig/Makefile pkgconfig/libva-drm.pc pkgconfig/libva-egl.pc @@ -323,20 +318,12 @@ debian.upstream/libva-x11.install.in pkgconfig/libva-wayland.pc pkgconfig/libva-x11.pc pkgconfig/libva.pc - test/Makefile - test/basic/Makefile - test/common/Makefile - test/decode/Makefile - test/encode/Makefile - test/putsurface/Makefile - test/vainfo/Makefile va/Makefile va/drm/Makefile va/egl/Makefile va/glx/Makefile va/va_version.h va/wayland/Makefile - va/wayland/protocol/Makefile va/x11/Makefile ]) @@ -354,6 +341,6 @@ echo echo Installation prefix .............. : $prefix echo Default driver path .............. : $LIBVA_DRIVERS_PATH echo Extra window systems ............. : $BACKENDS -echo Build dummy driver ............... : $enable_dummy_driver echo Build documentation .............. : $enable_docs +echo Build with messaging ............. : $enable_va_messaging echo