Remove qcairo dependency, only use pixman

client/canvas.h

@@ -21,7 +21,6 @@
 #include "common.h"
 #include "debug.h"
 #include "region.h"
-#include "cairo.h"
 #include <spice/protocol.h>
 #include "cache.hpp"
 #include "shared_cache.hpp"

client/display_channel.h

@@ -22,7 +22,6 @@
 #include "canvas.h"
 #include "region.h"
 #include "red_channel.h"
-#include "cairo.h"
 #include "cache.hpp"
 #include "screen_layer.h"
 #include "process_loop.h"

client/x11/Makefile.am

@@ -17,7 +17,7 @@ INCLUDES = \
 	$(GL_CFLAGS)					\
 	$(ALSA_CFLAGS)					\
 	$(FFMPEG_CFLAGS)				\
-	$(QCAIRO_CFLAGS)				\
+	$(PIXMAN_CFLAGS)				\
 	$(LOG4CPP_CFLAGS)				\
 	$(CELT051_CFLAGS)				\
 	$(SSL_CFLAGS)					\
@@ -155,7 +155,7 @@ spicec_LDFLAGS = \
 	$(CEGUI_LIBS)
 
 spicec_LDADD =						\
-	$(QCAIRO_LIBS)					\
+	$(PIXMAN_LIBS)					\
 	$(FFMPEG_LIBS)					\
 	$(ALSA_LIBS)					\
 	$(GL_LIBS)					\

configure.ac

@@ -120,12 +120,10 @@ AC_SUBST(SLIRP_CFLAGS)
 AC_SUBST(SLIRP_LIBS)
 SPICE_REQUIRES+=" slirp"
 
-PKG_CHECK_MODULES(QCAIRO, qcairo >= 1.4.6)
-AC_SUBST(QCAIRO_CFLAGS)
-AC_SUBST(QCAIRO_LIBS)
-QCAIRO_LIBDIR=`pkg-config --variable=libdir qcairo`
-AC_SUBST(QCAIRO_LIBDIR)
-SPICE_REQUIRES+=" qcairo >= 1.4.6"
+PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
+AC_SUBST(PIXMAN_CFLAGS)
+AC_SUBST(PIXMAN_LIBS)
+SPICE_REQUIRES+=" pixman-1 >= 0.17.7"
 
 PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
 AC_SUBST(CELT051_CFLAGS)

server/Makefile.am

@@ -6,7 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir)/common/linux	\
 	$(PROTOCOL_CFLAGS)			\
 	$(FFMPEG_CFLAGS)			\
-	$(QCAIRO_CFLAGS)			\
+	$(PIXMAN_CFLAGS)			\
 	$(GL_CFLAGS)				\
 	$(LOG4CPP_CFLAGS)			\
 	$(SSL_CFLAGS)				\
@@ -42,7 +42,7 @@ libspice_la_LDFLAGS = 				\
 libspice_la_LIBADD = 				\
 	$(GL_LIBS)				\
 	$(FFMPEG_LIBS)				\
-	$(QCAIRO_LIBS)				\
+	$(PIXMAN_LIBS)				\
 	$(SSL_LIBS)				\
 	$(CELT051_LIBS)				\
 	$(SLIRP_LIBS)				\