pixman: Changes to 'upstream-experimental'
Rebased ref, commits from common ancestor:
commit c5e048d46c32c43172fb8d1c067e82587f916953
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Oct 27 16:51:40 2010 -0400
Pre-release version bump to 0.20.0
diff --git a/configure.ac b/configure.ac
index 0ad2d38..dd70f8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
#
m4_define([pixman_major], 0)
-m4_define([pixman_minor], 19)
-m4_define([pixman_micro], 7)
+m4_define([pixman_minor], 20)
+m4_define([pixman_micro], 0)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
commit 6a6d9758af478e9f5eae48ccf15f1cbea2cf30ed
Author: Scott McCreary <scottmc2@gmail.com>
Date: Wed Oct 27 12:31:27 2010 -0700
Added check to find pthread on Haiku.
diff --git a/configure.ac b/configure.ac
index fede3e9..0ad2d38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -726,7 +726,8 @@ if test $support_for__thread = no; then
PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"])
PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"])
-
+ PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"])
+
if test $support_for_pthread_setspecific = yes; then
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_DEFINE([HAVE_PTHREAD_SETSPECIFIC], [], [Whether pthread_setspecific() is supported])
commit 00fdb3d8e8d5c04d01c352315b6a8e2e2dfe53ae
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Oct 24 15:58:39 2010 +0100
Plug another leak in alphamap test
Even after commit e46be417cebac984a858da05e61d924889695c9e alphamap
test is still leaking the alphamap pixmap, leading to mmap() failures
on cygwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
diff --git a/test/alphamap.c b/test/alphamap.c
index 6013e63..9fb8969 100644
--- a/test/alphamap.c
+++ b/test/alphamap.c
@@ -82,6 +82,7 @@ create_image (pixman_format_code_t format, pixman_format_code_t alpha_format,
pixman_image_set_alpha_map (image, alpha,
alpha_origin_x, alpha_origin_y);
+ pixman_image_unref (alpha);
}
return image;
@@ -217,6 +218,10 @@ run_test (int s, int d, int sa, int da, int soff, int doff)
}
}
+ pixman_image_set_alpha_map (src, NULL, 0, 0);
+ pixman_image_set_alpha_map (dst, NULL, 0, 0);
+ pixman_image_set_alpha_map (orig_dst, NULL, 0, 0);
+
pixman_image_unref (src);
pixman_image_unref (dst);
pixman_image_unref (orig_dst);
commit 1c23142efa056124c594c72022e7f383e839d3b1
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Oct 20 16:31:57 2010 -0400
Post-release version bump to 0.19.7
diff --git a/configure.ac b/configure.ac
index 4bd20fd..fede3e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 19)
-m4_define([pixman_micro], 6)
+m4_define([pixman_micro], 7)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
Reply to: