diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2016-02-01 00:49:48 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2016-02-01 00:50:46 +0000 |
commit | 1d4f136ac91e0936538856afd553bfae55b25d98 (patch) | |
tree | f25ee8621c2bb8a6607fd2d127e778b398ef40cf | |
parent | cf0bec6385b786aa9c4e4841cf0eb3522a51a9a5 (diff) | |
download | gstreamer-plugins-bad-1d4f136ac91e0936538856afd553bfae55b25d98.tar.gz |
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.
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | ext/rsvg/gstrsvgdec.h | 3 | ||||
-rw-r--r-- | ext/rsvg/gstrsvgoverlay.h | 3 |
3 files changed, 1 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 921698737..448cb3782 100644 --- a/configure.ac +++ b/configure.ac @@ -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 *** diff --git a/ext/rsvg/gstrsvgdec.h b/ext/rsvg/gstrsvgdec.h index 8d7173b5e..37700206a 100644 --- a/ext/rsvg/gstrsvgdec.h +++ b/ext/rsvg/gstrsvgdec.h @@ -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 diff --git a/ext/rsvg/gstrsvgoverlay.h b/ext/rsvg/gstrsvgoverlay.h index 151d094eb..9cd00face 100644 --- a/ext/rsvg/gstrsvgoverlay.h +++ b/ext/rsvg/gstrsvgoverlay.h @@ -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> |