diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2013-01-01 15:52:09 +0400 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2013-01-01 15:52:09 +0400 |
| commit | 08702be68f2745ff331324bb65482e4bfc80da6a (patch) | |
| tree | 6d0c3cca36f8a76fa00276c619755ed6d5b67fcb /configure.ac | |
| parent | 1a073355bce618a298fbf728f9d07ae7922a1af7 (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 a92f3ef8b..ae1fc98ea 100644 --- a/configure.ac +++ b/configure.ac @@ -302,7 +302,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 @@ -682,15 +682,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 *** @@ -969,7 +962,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) |