# - 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], [33])
+m4_define([va_api_minor_version], [40])
m4_define([va_api_micro_version], [0])
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], [2])
m4_define([libva_pre_version], [1])
m4_define([libva_version],
m4_define([wayland_api_version], [1.0.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])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
[build with VA/Wayland API support @<:@default=yes@:>@])],
[], [enable_wayland="yes"])
+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_ENABLE(dummy-driver,
[AC_HELP_STRING([--enable-dummy-driver],
[build dummy video driver @<:@default=yes@:>@])],
# Check for Doxygen
if test "$enable_docs" = "yes"; then
- AC_CHECK_TOOL([DOXYGEN], [doxygen], [enable_docs="no"])
+ AC_CHECK_TOOL([DOXYGEN], [doxygen], [no])
+ if test "$DOXYGEN" = "no"; then
+ enable_docs="no"
+ fi
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,
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)
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-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/v4l_h264/Makefile
- test/v4l_h264/decode/Makefile
- test/v4l_h264/encode/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
])
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