Commit 1d4f136a authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

rsvg: bump requirement to 2.36.2

Which allows us to simplify the configure check and
some special-casing in the code, and is plenty old
in any case.
parent cf0bec63
......@@ -2722,17 +2722,7 @@ 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.36 cairo, [
HAVE_RSVG="yes"
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"
])
AC_SUBST(RSVG_CFLAGS)
AC_SUBST(RSVG_LIBS)
AG_GST_PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= 2.36.2)
])
dnl *** gl ***
......
......@@ -27,9 +27,6 @@
#include <cairo/cairo.h>
#include <librsvg/rsvg.h>
#ifndef HAVE_RSVG_2_36_2
#include <librsvg/rsvg-cairo.h>
#endif
G_BEGIN_DECLS
......
......@@ -21,9 +21,6 @@
#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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment