mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix build with GStreamer >= 1.3.

Browse source 
http://bugzilla.gnome.org/show_bug.cgi?id=715183

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Matthieu Bouron 2013-11-26 12:06:07 +00:00 committed by Gwenole Beauchesne
parent 98fa9e7d59
commit 76174922bc
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure.ac
View file

@ -14,6 +14,7 @@ m4_define([gst_vaapi_lt_current], [4])
m4_define([gst0_vaapi_lt_current_bias], [0]) m4_define([gst0_vaapi_lt_current_bias], [0])
m4_define([gst1_vaapi_lt_current_bias], [2]) m4_define([gst1_vaapi_lt_current_bias], [2])
m4_define([gst2_vaapi_lt_current_bias], [4]) m4_define([gst2_vaapi_lt_current_bias], [4])
m4_define([gst4_vaapi_lt_current_bias], [4])
m4_define([gst_vaapi_lt_revision], [0]) m4_define([gst_vaapi_lt_revision], [0])
m4_define([gst_vaapi_lt_age], [0]) m4_define([gst_vaapi_lt_age], [0])
@ -31,6 +32,9 @@ m4_define([gst1_plugins_bad_version], [1.0.0])
m4_define([gst12_version], [1.1.90]) m4_define([gst12_version], [1.1.90])
m4_define([gst12_plugins_base_version], [1.1.0]) m4_define([gst12_plugins_base_version], [1.1.0])
m4_define([gst12_plugins_bad_version], [1.1.0]) m4_define([gst12_plugins_bad_version], [1.1.0])
m4_define([gst14_version], [1.2.90])
m4_define([gst14_plugins_base_version], [1.3.0])
m4_define([gst14_plugins_bad_version], [1.3.0])
# Wayland minimum version number # Wayland minimum version number
m4_define([wayland_api_version], [1.0.0]) m4_define([wayland_api_version], [1.0.0])
@ -200,6 +204,11 @@ case $GST_API_VERSION in
GST_PLUGINS_BASE_VERSION_REQUIRED=gst12_plugins_base_version GST_PLUGINS_BASE_VERSION_REQUIRED=gst12_plugins_base_version
GST_PLUGINS_BAD_VERSION_REQUIRED=gst12_plugins_bad_version GST_PLUGINS_BAD_VERSION_REQUIRED=gst12_plugins_bad_version
;; ;;
1.3)
GST_VERSION_REQUIRED=gst14_version
GST_PLUGINS_BASE_VERSION_REQUIRED=gst14_plugins_base_version
GST_PLUGINS_BAD_VERSION_REQUIRED=gst14_plugins_bad_version
;;
*) *)
AC_MSG_ERROR([unsupported GStreamer API version $GST_API_VERSION]) AC_MSG_ERROR([unsupported GStreamer API version $GST_API_VERSION])
;; ;;
@ -269,9 +278,9 @@ PKG_CHECK_MODULES([GST_VIDEO],
AC_CACHE_CHECK([for GstVideoOverlayComposition], AC_CACHE_CHECK([for GstVideoOverlayComposition],
ac_cv_have_gst_video_overlay_composition, [ ac_cv_have_gst_video_overlay_composition, [
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GST_CFLAGS" CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_VIDEO_CFLAGS"
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
LIBS="$LIBS $GST_LIBS" LIBS="$LIBS $GST_LIBS $GST_VIDEO_LIBS"
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[[#include <gst/video/video-overlay-composition.h>]], [[#include <gst/video/video-overlay-composition.h>]],
@ -434,6 +443,7 @@ case $GST_API_VERSION in
0.10) lt_bias=gst0_vaapi_lt_current_bias;; 0.10) lt_bias=gst0_vaapi_lt_current_bias;;
1.0) lt_bias=gst1_vaapi_lt_current_bias;; 1.0) lt_bias=gst1_vaapi_lt_current_bias;;
1.2) lt_bias=gst2_vaapi_lt_current_bias;; 1.2) lt_bias=gst2_vaapi_lt_current_bias;;
1.3) lt_bias=gst4_vaapi_lt_current_bias;;
esac esac
GST_VAAPI_MAJOR_VERSION=`expr gst_vaapi_lt_current - "$lt_bias"` GST_VAAPI_MAJOR_VERSION=`expr gst_vaapi_lt_current - "$lt_bias"`
AC_SUBST(GST_VAAPI_MAJOR_VERSION) AC_SUBST(GST_VAAPI_MAJOR_VERSION)

3
gst-libs/gst/vaapi/Makefile.am
View file

@ -280,6 +280,7 @@ libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(UDEV_CFLAGS) \ $(UDEV_CFLAGS) \
$(DRM_CFLAGS) \ $(DRM_CFLAGS) \
$(LIBVA_DRM_CFLAGS) \ $(LIBVA_DRM_CFLAGS) \
@ -315,6 +316,7 @@ libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(X11_CFLAGS) \ $(X11_CFLAGS) \
$(XRANDR_CFLAGS) \ $(XRANDR_CFLAGS) \
$(XRENDER_CFLAGS) \ $(XRENDER_CFLAGS) \
@ -389,6 +391,7 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(WAYLAND_CFLAGS) \ $(WAYLAND_CFLAGS) \
$(LIBVA_WAYLAND_CFLAGS) \ $(LIBVA_WAYLAND_CFLAGS) \
$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \ $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \

3
tests/Makefile.am
View file

@ -20,6 +20,7 @@ TEST_CFLAGS = \
-I$(top_builddir)/gst-libs \ -I$(top_builddir)/gst-libs \
$(LIBVA_CFLAGS) \ $(LIBVA_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(NULL) $(NULL)
TEST_LIBS = \ TEST_LIBS = \
@ -87,7 +88,7 @@ test_display_CFLAGS = $(TEST_CFLAGS)
test_display_LDADD = libutils.la $(TEST_LIBS) test_display_LDADD = libutils.la $(TEST_LIBS)
test_filter_SOURCES = test-filter.c test_filter_SOURCES = test-filter.c
test_filter_CFLAGS = $(TEST_CFLAGS) $(GST_VIDEO_CFLAGS) test_filter_CFLAGS = $(TEST_CFLAGS)
test_filter_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \ test_filter_LDADD = libutils.la $(TEST_LIBS) $(GST_VIDEO_LIBS) \
$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la $(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la