diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2013-01-01 11:52:09 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-01-04 13:22:02 +0000 |
| commit | bb3c5becae3f3c1454673eb69b80855befc8a58e (patch) | |
| tree | 3aa2dbfc0eb2f4f6b10e32339dea549f253c7d23 /configure.ac | |
| parent | e1dbc471c3566ff23f36f5506e9115d36781a4cd (diff) | |
cairo: port cairooverlay to 0.11
The other elements are not that interesting now that we're
using pangocairo in the pango plugin, and should probably
just be removed.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 76ec143bc..9d311a511 100644 --- a/configure.ac +++ b/configure.ac @@ -297,7 +297,7 @@ dnl *** plug-ins to include *** dnl Non ported plugins (non-dependant, then dependant) dnl Make sure you have a space before and after all plugins -GST_PLUGINS_NONPORTED="cairo cairo_gobject osx_audio " +GST_PLUGINS_NONPORTED="osx_audio " AC_SUBST(GST_PLUGINS_NONPORTED) dnl these are all the gst plug-ins, compilable without additional libs @@ -679,15 +679,8 @@ AG_GST_CHECK_FEATURE(AALIB, [aalib ASCII Art library], aasink, [ dnl *** cairo *** translit(dnm, m, l) AM_CONDITIONAL(USE_CAIRO, true) -AG_GST_CHECK_FEATURE(CAIRO, [Cairo graphics rendering], cairo, [ - AG_GST_PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0) -]) - -dnl *** cairo-gobject *** -translit(dnm, m, l) AM_CONDITIONAL(USE_CAIRO_GOBJECT, true) -AG_GST_CHECK_FEATURE(CAIRO_GOBJECT, - [Cairo graphics rendering gobject bindings], cairooverlay, [ - AG_GST_PKG_CHECK_MODULES(CAIRO_GOBJECT, cairo-gobject >= 1.10.0) +AG_GST_CHECK_FEATURE(CAIRO, [Cairo graphics rendering and gobject bindings], cairo, [ + AG_GST_PKG_CHECK_MODULES(CAIRO, cairo >= 1.10.0 cairo-gobject >= 1.10.0) ]) dnl *** FLAC *** @@ -966,7 +959,6 @@ dnl but we still need to set the conditionals AM_CONDITIONAL(USE_AALIB, false) AM_CONDITIONAL(USE_BZ2, false) AM_CONDITIONAL(USE_CAIRO, false) -AM_CONDITIONAL(USE_CAIRO_GOBJECT, false) AM_CONDITIONAL(USE_DIRECTSOUND, false) AM_CONDITIONAL(USE_DV1394, false) AM_CONDITIONAL(USE_FLAC, false) |