From: Víctor Manuel Jáquez Leal Date: Thu, 28 Jan 2016 18:01:43 +0000 (+0100) Subject: build: hard-code an unneeded macro X-Git-Tag: 1.19.3~503^2~1531 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=616c426032dcb8be5880138471079d857498f82e;p=platform%2Fupstream%2Fgstreamer.git build: hard-code an unneeded macro That macro is required for EGL's dynamic module loading, but since gstreamer-vaapi doesn't creates dynamic modules, it is not required anymore. That code in gst-libs/gst/vaapi/gstvaapidisplay_egl.c should be removed. Signed-off-by: Víctor Manuel Jáquez Leal --- diff --git a/configure.ac b/configure.ac index 6b13d29..1706486 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,6 @@ m4_define([default_glapi], [any]) # gstreamer-vaapi library (libtool) version number m4_define([gst_vaapi_lt_current], [7]) -m4_define([gst_vaapi_lt_current_bias], [7]) m4_define([gst_vaapi_lt_revision], [0]) m4_define([gst_vaapi_lt_age], [0]) @@ -245,10 +244,6 @@ if test "x$enable_egl" = "xyes" -a $HAVE_GSTGL -ne 1; then enable_egl="no" fi -GST_VAAPI_MAJOR_VERSION=`expr gst_vaapi_lt_current - gst_vaapi_lt_current_bias` -AC_DEFINE_UNQUOTED([GST_VAAPI_MAJOR_VERSION_S], ["$GST_VAAPI_MAJOR_VERSION"], - [Defined to the string representation of gstreamer-vaapi major version]) - dnl GST_ALL_LDFLAGS: dnl LDFLAGS really should only contain flags, not libs - they get added before dnl whatevertarget_LIBS and -L flags here affect the rest of the linking @@ -881,6 +876,10 @@ AC_DEFINE_UNQUOTED([USE_WAYLAND], [$USE_WAYLAND], [Defined to 1 if WAYLAND is enabled]) AM_CONDITIONAL([USE_WAYLAND], [test $USE_WAYLAND -eq 1]) +dnl @TODO hack for egl's dynamic module loading. remove it! +AC_DEFINE_UNQUOTED([GST_VAAPI_MAJOR_VERSION_S], ["0"], + [Defined to the string representation of gstreamer-vaapi major version]) + AC_CONFIG_FILES([ Makefile docs/Makefile