update NEWS for libva 2.4.0

[android-x86/hardware-intel-common-libva.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d723cfe..535b5b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,14 +21,14 @@
 # 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_micro_version], [1])
+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],
           [va_api_major_version.va_api_minor_version.va_api_micro_version])
@@ -41,8 +41,8 @@ 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_micro_version], [4])
+m4_define([libva_minor_version], [m4_eval(va_api_minor_version)])
+m4_define([libva_micro_version], [0])
 m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],
@@ -84,13 +84,13 @@ 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])])
@@ -144,11 +144,6 @@ AC_ARG_ENABLE(glx,
                     [build with VA/GLX API support @<:@default=auto@:>@])],
     [], [enable_glx="auto"])
 
-AC_ARG_ENABLE(egl,
-    [AC_HELP_STRING([--enable-egl],
-                    [build with VA/EGL API support @<:@default=auto@:>@])],
-    [], [enable_egl="auto"])
-
 AC_ARG_ENABLE([wayland],
     [AC_HELP_STRING([--enable-wayland],
                     [build with VA/Wayland API support @<:@default=auto@:>@])],
@@ -214,6 +209,22 @@ if test "$ac_cv_have_gnuc_visibility_attribute" = "yes"; then
               [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])
@@ -269,29 +280,6 @@ if test "$USE_X11:$enable_glx" != "yes:no"; then
 fi
 AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes")
 
-# Check for EGL
-USE_EGL="no"
-if test "x$enable_egl" != "xno"; 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 "x$USE_EGL" = "xno" -a "x$enable_egl" = "xyes"; then
-       AC_MSG_ERROR([VA/EGL explicitly enabled, but libEGL couldn't be found])
-    fi
-
-    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)
@@ -334,15 +322,12 @@ AC_OUTPUT([
     doc/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
@@ -354,7 +339,6 @@ BACKENDS=""
 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