mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

rsvg: bump requirement to 2.36.2

Browse source 
Which allows us to simplify the configure check and
some special-casing in the code, and is plenty old
in any case.
This commit is contained in:
Tim-Philipp Müller 2016-02-01 00:49:48 +00:00
parent cf0bec6385
commit 1d4f136ac9
3 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -2722,17 +2722,7 @@ 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.36 cairo, [ AG_GST_PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= 2.36.2)
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)
]) ])
dnl *** gl *** dnl *** gl ***

3
ext/rsvg/gstrsvgdec.h
View file

@ -27,9 +27,6 @@
#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,9 +21,6 @@
#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>