[cairo-commit] 2 commits - boilerplate/Makefile.am Makefile.am perf/Makefile.am src/cairo-xlib-surface.c src/Makefile.am test/Makefile.am

[Carl Worth]

 Makefile.am              |    2 ++
 boilerplate/Makefile.am  |    2 ++
 perf/Makefile.am         |    2 ++
 src/Makefile.am          |    2 ++
 src/cairo-xlib-surface.c |    4 ++--
 test/Makefile.am         |    2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 7800cfd7de347bb8c54fc36ed886018a2d9ec503
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Feb 6 17:00:29 2008 -0800

    Add several Makefile.win32 files to EXTRA_DIST
    
    Otherwise, these files were being omitted from the tar files.

diff --git a/Makefile.am b/Makefile.am
index 6db152a..481d1c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -242,3 +242,5 @@ doc-publish: doc
 	ssh $(RELEASE_UPLOAD_HOST) "cd $(MANUAL_UPLOAD_DIR) && tar xzf $(MANUAL_TAR_FILE) && rm -f manual && ln -s $(MANUAL_DATED) manual && ln -sf $(MANUAL_TAR_FILE) cairo-manual.tar.gz"
 
 .PHONY: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky release-check release-upload release-publish docs-publish lcov lcov-perf lcov-clean genlcov
+
+EXTRA_DIST += Makefile.win32
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 1d9c342..2caebe6 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = Makefile.win32
+
 EXTRA_LTLIBRARIES = libcairoboilerplate.la
 
 libcairoboilerplate_la_SOURCES =\
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 78fdeb2..319d82e 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -115,3 +115,5 @@ perf-callgrind:
 	    valgrind $(VALGRIND_CALLGRIND_FLAGS) $(EXTRA_VALGRIND_FLAGS)'
 
 .PHONY: perf html check-valgrind perf-valgrind perf-callgrind
+
+EXTRA_DIST += Makefile.win32
diff --git a/src/Makefile.am b/src/Makefile.am
index 51c86b1..c149a69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -373,3 +373,5 @@ splint:
 		echo sparse $$f; \
 		$(SPLINT) -I$(top_builddir) $(libcairo_la_CFLAGS) -DHAVE_CONFIG_H $$f || status=false; \
 	done; $$status
+
+EXTRA_DIST += Makefile.win32
diff --git a/test/Makefile.am b/test/Makefile.am
index 09547be..39d5e06 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -751,3 +751,5 @@ check-ref-missing:
 release-verify-sane-tests: check-ref-missing
 
 .PHONY: check-valgrind test recheck retest html rehtml check-ref-dups check-ref-missing release-verify-sane-tests
+
+EXTRA_DIST += Makefile.win32
commit ac743e25fa7f8bd720219a5c909fe8bbd20b11b2
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Jan 31 16:13:44 2008 +1100

    cairo_xlib_surface_create_similar: Pass the original drawable to XCreatePixmap
    
    Previously we were passing the root window of the same screen.
    Letting the X server know the actual Drawable for which we're
    trying to be similar allows the X server to be more efficient.

diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 1111320..a555322 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -168,7 +168,7 @@ _cairo_xlib_surface_create_similar_with_format (void	       *abstract_src,
 	return NULL;
     }
 
-    pix = XCreatePixmap (dpy, RootWindowOfScreen (src->screen),
+    pix = XCreatePixmap (dpy, src->drawable,
 			 width <= 0 ? 1 : width, height <= 0 ? 1 : height,
 			 depth);
 
@@ -246,7 +246,7 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
     /* We've got a compatible XRenderFormat now, which means the
      * similar surface will match the existing surface as closely in
      * visual/depth etc. as possible. */
-    pix = XCreatePixmap (src->dpy, RootWindowOfScreen (src->screen),
+    pix = XCreatePixmap (src->dpy, src->drawable,
 			 width <= 0 ? 1 : width, height <= 0 ? 1 : height,
 			 xrender_format->depth);