[cairo-commit] 3 commits - src/cairo-xlib-display.c src/cairo-xlib-screen.c src/cairo-xlib-surface.c src/cairo-xlib-visual.c src/cairo-xlib-xcb-surface.c util/Makefile.am

[Andrea Canciani]

 src/cairo-xlib-display.c     |    4 ++++
 src/cairo-xlib-screen.c      |    4 ++++
 src/cairo-xlib-surface.c     |    4 ++++
 src/cairo-xlib-visual.c      |    4 ++++
 src/cairo-xlib-xcb-surface.c |   13 +++++++++++++
 util/Makefile.am             |    2 ++
 6 files changed, 31 insertions(+)

New commits:
commit ced061124d0b402c5ce471ce04e9a936dc46da94
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Thu Jun 16 14:43:56 2011 +0200

    xlib-xcb: Implement cairo_xlib_device_debug_{g,s}et_precision
    
    63bdae27a83381fb8c3786c2d7a6c2592e388ee9 introduced a new public API
    cairo_xlib_device_debug_set_precision(), exported by cairo-xlib.
    cairo-xlib-xcb must implement it as well, because it must provide the
    same public API.
    
    Fixes the compilation of cairo-sphinx with --enable-tee
    --enable-xlib-xcb --enable-script.
    
    Reported-by: James Cloos <cloos at jhcloos.com>

diff --git a/src/cairo-xlib-xcb-surface.c b/src/cairo-xlib-xcb-surface.c
index 9c5eb5a..868844b 100644
--- a/src/cairo-xlib-xcb-surface.c
+++ b/src/cairo-xlib-xcb-surface.c
@@ -540,4 +540,17 @@ cairo_xlib_surface_get_height (cairo_surface_t *abstract_surface)
     return surface->xcb->height;
 }
 
+void
+cairo_xlib_device_debug_set_precision (cairo_device_t *device,
+				       int precision)
+{
+    cairo_xcb_device_debug_set_precision (device, precision);
+}
+
+int
+cairo_xlib_device_debug_get_precision (cairo_device_t *device)
+{
+    return cairo_xcb_device_debug_get_precision (device);
+}
+
 #endif /* CAIRO_HAS_XLIB_XCB_FUNCTIONS */
commit 3a504282ef2c3383ad91209a522aa049898bd2c4
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Thu Jun 16 09:22:54 2011 +0200

    build: Don't build cairo-sphinx when the tee surface is off
    
    cairo-sphinx depends on cairo-tee, which is not always enabled.
    
    Reported-by: James Cloos <cloos at jhcloos.com>

diff --git a/util/Makefile.am b/util/Makefile.am
index 807a194..dc13abd 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -21,9 +21,11 @@ endif
 
 if BUILD_SPHINX
 if CAIRO_HAS_SCRIPT_SURFACE
+if CAIRO_HAS_TEE_SURFACE
 SUBDIRS += cairo-sphinx
 endif
 endif
+endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/src \
 	      -I$(top_builddir)/src \
commit f409f74decf63b3dbf68b713317a1eb17cd71a0f
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Thu Jun 16 08:47:56 2011 +0200

    xlib: Fix build of xlib-xcb
    
    45665c0d48396af7bd653d546115a5f36cfa9ae1 breaks the build of
    cairo-xlib-xcb because it does not disable the compilation of
    cairo-xlib implementation files when cairo-xlib-xcb is enable. This
    results in collisions when linking.
    
    Reported-by: James Cloos <cloos at jhcloos.com>

diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c
index 0dab558..1372d9e 100644
--- a/src/cairo-xlib-display.c
+++ b/src/cairo-xlib-display.c
@@ -35,6 +35,8 @@
 
 #include "cairoint.h"
 
+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
+
 #include "cairo-xlib-private.h"
 #include "cairo-xlib-xrender-private.h"
 #include "cairo-freelist-private.h"
@@ -663,3 +665,5 @@ cairo_xlib_device_debug_get_precision (cairo_device_t *device)
 
     return ((cairo_xlib_display_t *) device)->force_precision;
 }
+
+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c
index a0c3df8..8ac9935 100644
--- a/src/cairo-xlib-screen.c
+++ b/src/cairo-xlib-screen.c
@@ -54,6 +54,8 @@
 
 #include "cairoint.h"
 
+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
+
 #include "cairo-xlib-private.h"
 #include "cairo-xlib-xrender-private.h"
 
@@ -464,3 +466,5 @@ _cairo_xlib_screen_get_font_options (cairo_xlib_screen_t *info)
 
     return &info->font_options;
 }
+
+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index d9c9854..f8caf83 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -47,6 +47,8 @@
 
 #include "cairoint.h"
 
+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
+
 #include "cairo-xlib-private.h"
 #include "cairo-xlib-surface-private.h"
 #include "cairo-clip-private.h"
@@ -4849,3 +4851,5 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
 
     return status;
 }
+
+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
diff --git a/src/cairo-xlib-visual.c b/src/cairo-xlib-visual.c
index e076ed0..d9aac44 100644
--- a/src/cairo-xlib-visual.c
+++ b/src/cairo-xlib-visual.c
@@ -35,6 +35,8 @@
 
 #include "cairoint.h"
 
+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
+
 #include "cairo-xlib-private.h"
 
 #include "cairo-error-private.h"
@@ -185,3 +187,5 @@ _cairo_xlib_visual_info_destroy (cairo_xlib_visual_info_t *info)
     /* No need for XFreeColors() whilst using DefaultColormap */
     free (info);
 }
+
+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */