From 8a24892f2d80442b0cc075e0bc1b0cd717af2ddd Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 22 Jan 2015 14:13:11 +0000 Subject: [PATCH] Depend on a Cairo release with cairo_surface_set_device_scale() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are checking for Cairo ≥ 1.12 and then do an additional check for the existence of the cairo_surface_set_device_scale() function because there were no stable releases of Cairo with it. Now that Cairo 1.14 is out, we can simply bump up the dependency. --- clutter/clutter-canvas.c | 2 -- configure.ac | 14 +------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/clutter/clutter-canvas.c b/clutter/clutter-canvas.c index e75375404..5c5b4a661 100644 --- a/clutter/clutter-canvas.c +++ b/clutter/clutter-canvas.c @@ -494,9 +494,7 @@ clutter_canvas_emit_draw (ClutterCanvas *self) mapped_buffer = FALSE; } -#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE cairo_surface_set_device_scale (surface, window_scale, window_scale); -#endif self->priv->cr = cr = cairo_create (surface); diff --git a/configure.ac b/configure.ac index 8f5661fb2..e8c7262ee 100644 --- a/configure.ac +++ b/configure.ac @@ -139,7 +139,7 @@ m4_define([glib_req_version], [2.39.0]) m4_define([cogl_req_version], [1.17.5]) m4_define([json_glib_req_version], [0.12.0]) m4_define([atk_req_version], [2.5.3]) -m4_define([cairo_req_version], [1.12.0]) +m4_define([cairo_req_version], [1.14.0]) m4_define([pango_req_version], [1.30]) m4_define([gi_req_version], [1.39.0]) m4_define([uprof_req_version], [0.3]) @@ -822,18 +822,6 @@ AS_CASE([$enable_pixbuf], AM_CONDITIONAL([PIXBUF_TESTS], [test "x$pixbuf_tests" = "xyes"]) -# Check for cairo_set_device_scale, as we don't want to depend hard on -# this until there is a stable release with it -saved_CFLAGS="$CFLAGS" -saved_LIBS="$LIBS" -CAIRO_CFLAGS=`$PKG_CONFIG --cflags cairo` -CAIRO_LIBS=`$PKG_CONFIG --libs cairo` -CFLAGS="$CFLAGS $CAIRO_CFLAGS" -LIBS="$CAIRO_LIBS $LIBS" -AC_CHECK_FUNCS(cairo_surface_set_device_scale) -LIBS="$saved_LIBS" -CFLAGS="$saved_CFLAGS" - dnl === Enable debug level ==================================================== m4_define([debug_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [minimum])])