mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-02 21:48:55 +00:00
rsvg: Bump minimum requirement to 2.36.0
And handle header changes in 2.36.2
This commit is contained in:
parent
3f228f3dfc
commit
725f8dc1f7
4 changed files with 10 additions and 8 deletions
|
@ -1791,11 +1791,11 @@ AG_GST_CHECK_FEATURE(PVR, [pvrvideosink], pvr, [
|
|||
dnl *** rsvg ***
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_RSVG, true)
|
||||
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"
|
||||
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")
|
||||
if test "x$HAVE_RSVG_2_35_0" = "xyes"; then
|
||||
AC_DEFINE(HAVE_RSVG_2_35_0, [1], [Have RSVG 2.35.0 or newer])
|
||||
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_36_2" = "xyes"; then
|
||||
AC_DEFINE(HAVE_RSVG_2_36_2, [1], [Have RSVG 2.36.2 or newer])
|
||||
fi
|
||||
], [
|
||||
HAVE_RSVG="no"
|
||||
|
|
|
@ -29,10 +29,6 @@
|
|||
static gboolean
|
||||
plugin_init (GstPlugin * plugin)
|
||||
{
|
||||
#ifndef HAVE_RSVG_2_35_0
|
||||
rsvg_init ();
|
||||
#endif
|
||||
|
||||
return (gst_element_register (plugin, "rsvgoverlay",
|
||||
GST_RANK_NONE, GST_TYPE_RSVG_OVERLAY)
|
||||
&&
|
||||
|
|
|
@ -27,6 +27,9 @@
|
|||
#include <cairo/cairo.h>
|
||||
|
||||
#include <librsvg/rsvg.h>
|
||||
#ifndef HAVE_RSVG_2_36_2
|
||||
#include <librsvg/rsvg-cairo.h>
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -21,6 +21,9 @@
|
|||
#define __GST_RSVG_OVERLAY_H__
|
||||
|
||||
#include <librsvg/rsvg.h>
|
||||
#ifndef HAVE_RSVG_2_36_2
|
||||
#include <librsvg/rsvg-cairo.h>
|
||||
#endif
|
||||
#include <gst/gst.h>
|
||||
#include <gst/video/video.h>
|
||||
#include <gst/video/gstvideofilter.h>
|
||||
|
|
Loading…
Reference in a new issue