# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# VA-API version
-# - increment major for any ABI change (which shall not occur!)
+# - increment major for any ABI change
# - increment minor for any interface change (e.g. new/modified function)
# - increment micro for any other change (new flag, new codec definition, etc.)
# - 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], [40])
+m4_define([va_api_major_version], [1])
+m4_define([va_api_minor_version], [4])
m4_define([va_api_micro_version], [0])
m4_define([va_api_version],
# - increment micro for any library release
# - 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_minor_version], [m4_eval(va_api_minor_version)])
m4_define([libva_micro_version], [0])
-m4_define([libva_pre_version], [0])
+m4_define([libva_pre_version], [1])
m4_define([libva_version],
[libva_major_version.libva_minor_version.libva_micro_version])
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],
- [https://github.com/01org/libva/issues/new],
+ [https://github.com/intel/libva/issues/new],
[libva],
- [https://github.com/01org/libva])
+ [https://github.com/intel/libva])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2 -Wno-portability])
AC_CONFIG_HEADERS([config.h])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_ARG_ENABLE(x11,
[AC_HELP_STRING([--enable-x11],
- [build with VA/X11 API support @<:@default=yes@:>@])],
- [], [enable_x11="yes"])
+ [build with VA/X11 API support @<:@default=auto@:>@])],
+ [], [enable_x11="auto"])
AC_ARG_ENABLE(glx,
[AC_HELP_STRING([--enable-glx],
- [build with VA/GLX API support @<:@default=yes@:>@])],
- [], [enable_glx="yes"])
-
-AC_ARG_ENABLE(egl,
- [AC_HELP_STRING([--enable-egl],
- [build with VA/EGL API support @<:@default=yes@:>@])],
- [], [enable_egl="yes"])
+ [build with VA/GLX API support @<:@default=auto@:>@])],
+ [], [enable_glx="auto"])
AC_ARG_ENABLE([wayland],
[AC_HELP_STRING([--enable-wayland],
- [build with VA/Wayland API support @<:@default=yes@:>@])],
- [], [enable_wayland="yes"])
+ [build with VA/Wayland API support @<:@default=auto@:>@])],
+ [], [enable_wayland="auto"])
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@:>@])],
- [], [enable_dummy_driver="yes"])
-AM_CONDITIONAL(BUILD_DUMMY_DRIVER, test x$enable_dummy_driver = xyes)
-
AC_ARG_WITH(drivers-path,
[AC_HELP_STRING([--with-drivers-path=[[path]]],
[drivers path])],
AC_PROG_CC
AC_PROG_CXX
AM_PROG_CC_C_O
+AC_PROG_SED
PKG_PROG_PKG_CONFIG
AC_HEADER_STDC
[Defined to 1 if GCC visibility attribute is supported])
fi
+# Check for -fstack-protector
+ssp_cc=yes
+if test "X$CC-cc" != "X"; then
+ AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector])
+ ssp_old_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -fstack-protector"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no])
+ AC_MSG_RESULT([$ssp_cc])
+ if test "X$ssp_cc" = "Xno"; then
+ CFLAGS="$ssp_old_cflags"
+ else
+ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+ fi
+fi
+AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes")
+
# Check for DRM (mandatory)
LIBDRM_VERSION=libdrm_version
PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION])
# Check for X11
USE_X11="no"
-if test "$enable_x11" = "yes"; then
- USE_X11="yes"
- PKG_CHECK_MODULES([X11], [x11], [:], [USE_X11="no"])
- PKG_CHECK_MODULES([XEXT], [xext], [:], [USE_X11="no"])
- PKG_CHECK_MODULES([XFIXES], [xfixes], [:], [USE_X11="no"])
+if test "x$enable_x11" != "xno"; then
+ PKG_CHECK_MODULES([X11], [x11 xext xfixes], [USE_X11="yes"], [:])
+
+ if test "x$USE_X11" = "xno" -a "x$enable_x11" = "xyes"; then
+ AC_MSG_ERROR([VA/X11 explicitly enabled, however $X11_PKG_ERRORS])
+ fi
+
if test "$USE_X11" = "yes"; then
AC_DEFINE([HAVE_VA_X11], [1], [Defined to 1 if VA/X11 API is built])
fi
# Check for GLX
USE_GLX="no"
-if test "$USE_X11:$enable_glx" = "yes:yes"; then
+
+if test "$USE_X11:$enable_glx" = "no:yes"; then
+ AC_MSG_ERROR([VA/GLX explicitly enabled, but VA/X11 isn't built])
+fi
+
+if test "$USE_X11:$enable_glx" != "yes:no"; then
PKG_CHECK_MODULES([GLX], [gl x11], [USE_GLX="yes"], [:])
saved_CPPFLAGS="$CPPFLAGS"
saved_LIBS="$LIBS"
AC_CHECK_LIB([GL], [glXCreateContext], [:] [USE_GLX="no"])
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS"
+
+ if test "x$USE_GLX" = "xno" -a "x$enable_glx" = "xyes"; then
+ AC_MSG_ERROR([VA/GLX explicitly enabled, but libGL couldn't be found])
+ fi
+
if test "$USE_GLX" = "yes"; then
AC_DEFINE([HAVE_VA_GLX], [1], [Defined to 1 if VA/GLX API is built])
fi
fi
AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes")
-# Check for EGL
-USE_EGL="no"
-if test "$enable_egl" = "yes"; then
- PKG_CHECK_MODULES([EGL], [egl], [USE_EGL="yes"], [:])
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $EGL_CFLAGS"
- LIBS="$LIBS $EGL_LIBS"
- AC_CHECK_HEADERS([EGL/egl.h], [:], [USE_EGL="no"])
- AC_CHECK_LIB([EGL], [eglGetDisplay], [:], [USE_EGL="no"])
- CPPFLAGS="$saved_CPPFLAGS"
- LIBS="$saved_LIBS"
- if test "$USE_EGL" = "yes"; then
- AC_DEFINE([HAVE_VA_EGL], [1], [Defined to 1 if VA/EGL API is built])
- fi
-fi
-AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
-
# Check for Wayland
WAYLAND_API_VERSION=wayland_api_version
AC_SUBST(WAYLAND_API_VERSION)
USE_WAYLAND="no"
-if test "$enable_wayland" = "yes"; then
+if test "x$enable_wayland" != "xno"; then
PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version],
[USE_WAYLAND="yes"], [:])
+
+ if test "x$USE_WAYLAND" = "xno" -a "x$enable_wayland" = "xyes"; then
+ AC_MSG_ERROR([wayland explicitly enabled, however $WAYLAND_PKG_ERRORS])
+ fi
+
if test "$USE_WAYLAND" = "yes"; then
WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
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
doc/Makefile
- dummy_drv_video/Makefile
pkgconfig/Makefile
pkgconfig/libva-drm.pc
- pkgconfig/libva-egl.pc
pkgconfig/libva-glx.pc
- pkgconfig/libva-tpi.pc
pkgconfig/libva-wayland.pc
pkgconfig/libva-x11.pc
pkgconfig/libva.pc
va/Makefile
va/drm/Makefile
- va/egl/Makefile
va/glx/Makefile
va/va_version.h
va/wayland/Makefile
AS_IF([test x$USE_DRM = xyes], [BACKENDS="$BACKENDS drm"])
AS_IF([test x$USE_X11 = xyes], [BACKENDS="$BACKENDS x11"])
AS_IF([test x$USE_GLX = xyes], [BACKENDS="$BACKENDS glx"])
-AS_IF([test x$USE_EGL = xyes], [BACKENDS="$BACKENDS egl"])
AS_IF([test x$USE_WAYLAND = xyes], [BACKENDS="$BACKENDS wayland"])
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
OSDN Git Service
