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

rsvg: Bump minimum requirement to 2.36.0

Browse source 
And handle header changes in 2.36.2
This commit is contained in:
Edward Hervey 2013-04-03 14:55:52 +02:00
parent 3f228f3dfc
commit 725f8dc1f7
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1791,11 +1791,11 @@ AG_GST_CHECK_FEATURE(PVR, [pvrvideosink], pvr, [
dnl *** rsvg *** dnl *** rsvg ***
translit(dnm, m, l) AM_CONDITIONAL(USE_RSVG, true) translit(dnm, m, l) AM_CONDITIONAL(USE_RSVG, true)
AG_GST_CHECK_FEATURE(RSVG, [rsvg decoder], rsvg, [ AG_GST_CHECK_FEATURE(RSVG, [rsvg decoder], rsvg, [
PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= 2.14 cairo, [ PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= 2.36 cairo, [
HAVE_RSVG="yes" HAVE_RSVG="yes"
PKG_CHECK_MODULES(RSVG_2_35_0, librsvg-2.0 >= 2.35.0, HAVE_RSVG_2_35_0="yes", HAVE_RSVG_2_35_0="no") PKG_CHECK_MODULES(RSVG_2_36_2, librsvg-2.0 >= 2.36.2, HAVE_RSVG_2_36_2="yes", HAVE_RSVG_2_36_2="no")
if test "x$HAVE_RSVG_2_35_0" = "xyes"; then if test "x$HAVE_RSVG_2_36_2" = "xyes"; then
AC_DEFINE(HAVE_RSVG_2_35_0, [1], [Have RSVG 2.35.0 or newer]) AC_DEFINE(HAVE_RSVG_2_36_2, [1], [Have RSVG 2.36.2 or newer])
fi fi
], [ ], [
HAVE_RSVG="no" HAVE_RSVG="no"

4
ext/rsvg/gstrsvg.c
View file

@ -29,10 +29,6 @@
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
#ifndef HAVE_RSVG_2_35_0
rsvg_init ();
#endif
return (gst_element_register (plugin, "rsvgoverlay", return (gst_element_register (plugin, "rsvgoverlay",
GST_RANK_NONE, GST_TYPE_RSVG_OVERLAY) GST_RANK_NONE, GST_TYPE_RSVG_OVERLAY)
&& &&

3
ext/rsvg/gstrsvgdec.h
View file

@ -27,6 +27,9 @@
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <librsvg/rsvg.h> #include <librsvg/rsvg.h>
#ifndef HAVE_RSVG_2_36_2
#include <librsvg/rsvg-cairo.h>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS

3
ext/rsvg/gstrsvgoverlay.h
View file

@ -21,6 +21,9 @@
#define __GST_RSVG_OVERLAY_H__ #define __GST_RSVG_OVERLAY_H__
#include <librsvg/rsvg.h> #include <librsvg/rsvg.h>
#ifndef HAVE_RSVG_2_36_2
#include <librsvg/rsvg-cairo.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/video/gstvideofilter.h> #include <gst/video/gstvideofilter.h>