Hello,
The attached patch fix the build of gstreamer-vaapi with gstreamer >= 1.2
(including gstreamer 1.3.x).
Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=715183
Is there an irc channel related to gstreamer-vaapi ?
Thanks in advance.
Best regards,
Matthieu
>From 0346a0ecd55a8e446460cbd201dda79309272316 Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bou...@collabora.com>
Date: Tue, 26 Nov 2013 12:06:07 +0000
Subject: [PATCH] Fix build with gstreamer >= 1.2
---
configure.ac | 19 ++++++++++++++++---
gst-libs/gst/vaapi/Makefile.am | 3 +++
tests/Makefile.am | 3 ++-
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index d0bcb46..acabfe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,10 +10,11 @@ m4_append([gst_vaapi_version], gst_vaapi_pre_version, [.pre])
])
# gstreamer-vaapi library (libtool) version number
-m4_define([gst_vaapi_lt_current], [4])
+m4_define([gst_vaapi_lt_current], [6])
m4_define([gst0_vaapi_lt_current_bias], [0])
m4_define([gst1_vaapi_lt_current_bias], [2])
m4_define([gst2_vaapi_lt_current_bias], [4])
+m4_define([gst4_vaapi_lt_current_bias], [6])
m4_define([gst_vaapi_lt_revision], [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_plugins_base_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
m4_define([wayland_api_version], [1.0.0])
@@ -200,6 +204,12 @@ case $GST_API_VERSION in
GST_PLUGINS_BASE_VERSION_REQUIRED=gst12_plugins_base_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])
;;
@@ -218,6 +228,8 @@ AS_VERSION_COMPARE([$GST_API_VERSION], [1.0],
[], [USE_GST_API_1_0p="yes"], [USE_GST_API_1_0p="yes"])
AS_VERSION_COMPARE([$GST_API_VERSION], [1.2],
[], [USE_GST_API_1_2p="yes"], [USE_GST_API_1_2p="yes"])
+AS_VERSION_COMPARE([$GST_API_VERSION], [1.3],
+ [], [USE_GST_API_1_2p="yes"], [USE_GST_API_1_2p="yes"])
AM_CONDITIONAL([USE_GST_API_0_10], [test "$USE_GST_API_0_10" = "yes"])
AM_CONDITIONAL([USE_GST_API_1_0p], [test "$USE_GST_API_1_0p" = "yes"])
AM_CONDITIONAL([USE_GST_API_1_2p], [test "$USE_GST_API_1_2p" = "yes"])
@@ -269,9 +281,9 @@ PKG_CHECK_MODULES([GST_VIDEO],
AC_CACHE_CHECK([for GstVideoOverlayComposition],
ac_cv_have_gst_video_overlay_composition, [
saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GST_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_VIDEO_CFLAGS"
saved_LIBS="$LIBS"
- LIBS="$LIBS $GST_LIBS"
+ LIBS="$LIBS $GST_LIBS $GST_VIDEO_LIBS"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <gst/video/video-overlay-composition.h>]],
@@ -434,6 +446,7 @@ case $GST_API_VERSION in
0.10) lt_bias=gst0_vaapi_lt_current_bias;;
1.0) lt_bias=gst1_vaapi_lt_current_bias;;
1.2) lt_bias=gst2_vaapi_lt_current_bias;;
+1.3) lt_bias=gst4_vaapi_lt_current_bias;;
esac
GST_VAAPI_MAJOR_VERSION=`expr gst_vaapi_lt_current - "$lt_bias"`
AC_SUBST(GST_VAAPI_MAJOR_VERSION)
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index f2f9bba..0b5eb66 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -280,6 +280,7 @@ libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \
$(GST_BASE_CFLAGS) \
+ $(GST_VIDEO_CFLAGS) \
$(UDEV_CFLAGS) \
$(DRM_CFLAGS) \
$(LIBVA_DRM_CFLAGS) \
@@ -315,6 +316,7 @@ libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \
$(GST_BASE_CFLAGS) \
+ $(GST_VIDEO_CFLAGS) \
$(X11_CFLAGS) \
$(XRANDR_CFLAGS) \
$(XRENDER_CFLAGS) \
@@ -389,6 +391,7 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \
$(GST_BASE_CFLAGS) \
+ $(GST_VIDEO_CFLAGS) \
$(WAYLAND_CFLAGS) \
$(LIBVA_WAYLAND_CFLAGS) \
$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2e7f191..ec6863a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,7 @@ TEST_CFLAGS = \
-I$(top_builddir)/gst-libs \
$(LIBVA_CFLAGS) \
$(GST_CFLAGS) \
+ $(GST_VIDEO_CFLAGS) \
$(NULL)
TEST_LIBS = \
@@ -87,7 +88,7 @@ test_display_CFLAGS = $(TEST_CFLAGS)
test_display_LDADD = libutils.la $(TEST_LIBS)
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) \
$(top_builddir)/gst-libs/gst/video/libgstvaapi-videoutils.la
--
1.8.4.2
_______________________________________________
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva
