From 725f8dc1f783390afae5e6d48eebc9a6995d3f47 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@collabora.com>
Date: Wed, 3 Apr 2013 14:55:52 +0200
Subject: [PATCH] rsvg: Bump minimum requirement to 2.36.0

And handle header changes in 2.36.2
---
 configure.ac              | 8 ++++----
 ext/rsvg/gstrsvg.c        | 4 ----
 ext/rsvg/gstrsvgdec.h     | 3 +++
 ext/rsvg/gstrsvgoverlay.h | 3 +++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2c0c1e5d0f..c2b322b0b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"
diff --git a/ext/rsvg/gstrsvg.c b/ext/rsvg/gstrsvg.c
index ed95fb6451..28921e9cb6 100644
--- a/ext/rsvg/gstrsvg.c
+++ b/ext/rsvg/gstrsvg.c
@@ -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)
       &&
diff --git a/ext/rsvg/gstrsvgdec.h b/ext/rsvg/gstrsvgdec.h
index 13e40caadb..cad198c0e7 100644
--- a/ext/rsvg/gstrsvgdec.h
+++ b/ext/rsvg/gstrsvgdec.h
@@ -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
 
diff --git a/ext/rsvg/gstrsvgoverlay.h b/ext/rsvg/gstrsvgoverlay.h
index 9cd00facec..151d094eb0 100644
--- a/ext/rsvg/gstrsvgoverlay.h
+++ b/ext/rsvg/gstrsvgoverlay.h
@@ -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>