X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure.ac;h=0507d64c4684cf71b9d325bfb9c5ac82bf6d877a;hb=fcb9cc881596d7ff809adf5f6ff631c708d407e3;hp=d723cfecca0f4b592f5687011a5337f563f3add8;hpb=8d8015ef82e57817fd8c2a9f23001995b67023aa;p=android-x86%2Fhardware-intel-common-libva.git

diff --git a/configure.ac b/configure.ac
index d723cfe..0507d64 100644
--- 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], [0])
+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], [1])
 m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],
@@ -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@:>@])],
@@ -269,29 +264,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)
@@ -329,20 +301,20 @@ 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
 
+AC_SUBST([AM_CFLAGS], ["-Wall -Werror"])
+AC_SUBST([AM_CXXFLAGS], ["-Wall -Werror"])
+
 AC_OUTPUT([
     Makefile
     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 +326,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