Release 1.11.1

[platform/upstream/gstreamer.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c4efc9f..ce1424a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # gstreamer-vaapi package version number
 m4_define([gst_vaapi_major_version], [1])
-m4_define([gst_vaapi_minor_version], [9])
+m4_define([gst_vaapi_minor_version], [11])
 m4_define([gst_vaapi_micro_version], [1])
-m4_define([gst_vaapi_nano_version],  [1])
+m4_define([gst_vaapi_nano_version],  [0])
 m4_define([gst_vaapi_version],
           [gst_vaapi_major_version.gst_vaapi_minor_version.gst_vaapi_micro_version])
 m4_if(gst_vaapi_nano_version, [0], [],
@@ -16,17 +16,17 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
 dnl - interfaces added -> increment AGE
 dnl - interfaces removed -> AGE = 0
 # gstreamer-vaapi library (libtool) version number
-m4_define([gst_vaapi_lt_current],       [901])
+m4_define([gst_vaapi_lt_current],       [1101])
 m4_define([gst_vaapi_lt_revision],      [0])
-m4_define([gst_vaapi_lt_age],           [901])
+m4_define([gst_vaapi_lt_age],           [1101])
 
 # glib version number
 m4_define([glib_version], [2.40])
 
 # gstreamer version number
-m4_define([gst_version],                [1.9.1.1])
-m4_define([gst_plugins_base_version],   [1.9.1.1])
-m4_define([gst_plugins_bad_version],    [1.9.1.1])
+m4_define([gst_version],                [1.11.1])
+m4_define([gst_plugins_base_version],   [1.11.1])
+m4_define([gst_plugins_bad_version],    [1.11.1])
 
 # Wayland minimum version number
 m4_define([wayland_api_version], [1.0.2])
@@ -183,8 +183,8 @@ dnl *** checks for libraries ***
 dnl check for libm, for sin() etc.
 AC_CHECK_LIB([m], [tan])
 
-dnl Check to see if dlopen is in default libraries (like Solaris, which
-dnl has it in libc), or if libdl is needed to get it.
+dnl Check to see if dlopen/dlsym is in default libraries (like
+dnl Solaris, which has it in libc), or if libdl is needed to get it.
 AC_CHECK_FUNC([dlopen], [], [
   AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
 AC_SUBST([DLOPEN_LIBS])
@@ -282,7 +282,7 @@ GstGLContext gl_context;
           CPPFLAGS="$saved_CPPFLAGS"
           LIBS="$saved_LIBS"
         ])
-    ], [])
+    ], [:])
 fi
 AS_IF([test "x$ac_cv_have_gst_gl_helpers" = "xno"], [HAVE_GSTGL=0])
 AM_CONDITIONAL([USE_GST_GL_HELPERS], [test $HAVE_GSTGL -eq 1])
@@ -308,7 +308,7 @@ if test "x$enable_drm" = "xyes"; then
       CPPFLAGS="$CPPFLAGS $DRM_CFLAGS"
       AC_CHECK_HEADERS([drm_fourcc.h], [], [USE_DRM=0])
       CPPFLAGS="$saved_CPPFLAGS"
-    ], [])
+    ], [:])
 fi
 
 dnl Check for X11
@@ -321,7 +321,7 @@ if test "x$enable_x11" = "xyes"; then
       CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
       AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h X11/Xatom.h], [], [USE_X11=0])
       CPPFLAGS="$saved_CPPFLAGS"
-    ], [])
+    ], [:])
 fi
 
 HAVE_XKBLIB=0
@@ -340,7 +340,7 @@ if test $USE_X11 -eq 1; then
       CPPFLAGS="$CPPFLAGS $XRANDR_CFLAGS"
       AC_CHECK_HEADERS([X11/extensions/Xrandr.h], [], [HAVE_XRANDR=0])
       CPPFLAGS="$saved_CPPFLAGS"
-    ], [])
+    ], [:])
 
   dnl Check for XRender
   PKG_CHECK_MODULES([XRENDER], [xrender],
@@ -350,7 +350,7 @@ if test $USE_X11 -eq 1; then
       CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
       AC_CHECK_HEADERS([X11/extensions/Xrender.h], [], [HAVE_XRENDER=0])
       CPPFLAGS="$saved_CPPFLAGS"
-    ], [])
+    ], [:])
 fi
 
 AC_DEFINE_UNQUOTED([HAVE_XKBLIB], [$HAVE_XKBLIB],
@@ -462,10 +462,7 @@ if test "x$enable_egl" = "xyes" -a $GLES_VERSION_MASK -ne 0; then
       AC_CHECK_LIB([EGL], [eglGetDisplay], [], [USE_EGL=0])
       CPPFLAGS="$saved_CPPFLAGS"
       LIBS="$saved_LIBS"
-
-      dnl Check for GMODULE
-      PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= $GLIB_REQ])
-    ], [])
+    ], [:])
 fi
 
 dnl Check for Wayland
@@ -478,7 +475,7 @@ if test "x$enable_wayland" = "xyes"; then
       CPPFLAGS="$CPPFLAGS $WAYLAND_CFLAGS"
       AC_CHECK_HEADERS([wayland-client.h], [], [USE_WAYLAND=0])
       CPPFLAGS="$saved_CPPFLAGS"
-    ], [])
+    ], [:])
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -488,6 +485,9 @@ dnl ---------------------------------------------------------------------------
 dnl Core API
 PKG_CHECK_MODULES([LIBVA], [libva >= $VAAPI_REQ])
 VA_VERSION_STR=`$PKG_CONFIG --modversion libva`
+VA_DRIVERS_PATH=`$PKG_CONFIG --variable=driverdir libva`
+AC_DEFINE_UNQUOTED([VA_DRIVERS_PATH], ["$VA_DRIVERS_PATH"],
+  [VA drivers path])
 
 dnl VA/DRM API
 if test $USE_DRM -eq 1; then
@@ -719,7 +719,7 @@ if test "x$enable_encoders" = "xyes"; then
 #include <va/va.h>
         ])
       CPPFLAGS="$saved_CPPFLAGS"
-    ], [])
+    ], [:])
 fi
 
 USE_JPEG_ENCODER=0