diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-02-18 21:00:24 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-02-23 22:52:06 +0100 |
| commit | 239b2b66b2cfd46abe8d84162a74a7e47a54d85b (patch) | |
| tree | ade9dd6dd1a0f7fe96029119007a26b4aa35abdb | |
| parent | 295738b453f44f43a941d072290c5e975c3a6cb4 (diff) | |
| download | spice-239b2b66b2cfd46abe8d84162a74a7e47a54d85b.tar.gz spice-239b2b66b2cfd46abe8d84162a74a7e47a54d85b.tar.xz spice-239b2b66b2cfd46abe8d84162a74a7e47a54d85b.zip | |
Remove qcairo dependency, only use pixman
| -rw-r--r-- | client/canvas.h | 1 | ||||
| -rw-r--r-- | client/display_channel.h | 1 | ||||
| -rw-r--r-- | client/x11/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | server/Makefile.am | 4 |
5 files changed, 8 insertions, 12 deletions
diff --git a/client/canvas.h b/client/canvas.h index 65856565..79400cc3 100644 --- a/client/canvas.h +++ b/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" diff --git a/client/display_channel.h b/client/display_channel.h index 802898f5..b2e37914 100644 --- a/client/display_channel.h +++ b/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" diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index d645c389..d703101e 100644 --- a/client/x11/Makefile.am +++ b/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) \ diff --git a/configure.ac b/configure.ac index dc67286b..8b289006 100644 --- a/configure.ac +++ b/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) diff --git a/server/Makefile.am b/server/Makefile.am index aaef6a71..f91debd1 100644 --- a/server/Makefile.am +++ b/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) \ |