ChangeLog | 46 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 7 +++++- debian/changelog | 8 +++++++ debian/rules | 2 - pixman/pixman-arm-neon-asm.S | 8 +++---- test/composite.c | 4 --- test/utils.c | 2 - 7 files changed, 67 insertions(+), 10 deletions(-)
New commits: commit 71a91107743bbc4e50a7cf6b5e14a8bbf1e1eb65 Author: Cyril Brulebois <[email protected]> Date: Tue Jul 5 14:02:18 2011 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index b9b4ef8..c278092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -pixman (0.22.2-1) UNRELEASED; urgency=low +pixman (0.22.2-1) unstable; urgency=low * New upstream stable release: - Fix glyph corruption on arm. * Enable parallel building (by passing --parallel to dh $@). - -- Cyril Brulebois <[email protected]> Tue, 05 Jul 2011 13:55:16 +0200 + -- Cyril Brulebois <[email protected]> Tue, 05 Jul 2011 14:02:13 +0200 pixman (0.22.0-1) unstable; urgency=low commit 748d5e223b34a82a9e0736b3033cba9d5a0c3f20 Author: Cyril Brulebois <[email protected]> Date: Tue Jul 5 13:56:20 2011 +0200 Enable parallel building (by passing --parallel to dh $@). diff --git a/debian/changelog b/debian/changelog index 8a50ac6..b9b4ef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pixman (0.22.2-1) UNRELEASED; urgency=low * New upstream stable release: - Fix glyph corruption on arm. + * Enable parallel building (by passing --parallel to dh $@). -- Cyril Brulebois <[email protected]> Tue, 05 Jul 2011 13:55:16 +0200 diff --git a/debian/rules b/debian/rules index f1ac6f7..d7fab98 100755 --- a/debian/rules +++ b/debian/rules @@ -29,4 +29,4 @@ override_dh_makeshlibs: dh_makeshlibs -p$(PACKAGE) --add-udeb $(PACKAGE)-udeb -V"$(PACKAGE) (>= $(SHLIBS))" -- -c4 %: - dh $@ --with quilt,autoreconf --builddirectory=build/ + dh $@ --with quilt,autoreconf --builddirectory=build/ --parallel commit 1303c8c6dc4dcb1d7ddef3d7d6baf95ead2ade49 Author: Cyril Brulebois <[email protected]> Date: Tue Jul 5 13:55:45 2011 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 5469ffd..384a4ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +commit 9ab7bc4623c6f6fa9012f12224fa9c33c551e374 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Mon Jul 4 16:24:16 2011 -0400 + + Pre-release version bump to 0.22.2 + +commit 7e657586007789d25f566536e6d2bea3afdf5ec6 +Author: Søren Sandmann <[email protected]> +Date: Sun Jun 19 20:29:08 2011 -0400 + + ARM: Fix two bugs in neon_composite_over_n_8888_0565_ca(). + + The first bug is that a vmull.u8 instruction would store its result in + the q1 register, clobbering the d2 register used later on. The second + is that a vraddhn instruction would overwrite d25, corrupting the q12 + register used later. + + Fixing the second bug caused a pipeline bubble where the d18 register + would be unavailable for a clock cycle. This is fixed by swapping the + instruction with its successor. + +commit 134bf5c5a7ce0cf69593a14e4dc50911d0da453d +Author: Andrea Canciani <[email protected]> +Date: Thu May 5 10:17:08 2011 +0200 + + test: Fix compilation on win32 + + MSVC complains about uint32_t being used as an expression: + + composite.c(902) : error C2275: 'uint32_t' : illegal use of this type + as an expression + +commit 22620ea9e97d6bf73eeb74d818903e0afaf74d43 +Author: Dave Yeo <[email protected]> +Date: Mon May 9 12:38:44 2011 +0200 + + Check for working mmap() + + OS/2 doesn't have a working mmap(). + +commit dd598cf73bb6bb3656f03902eabf007b9af42e59 +Author: Søren Sandmann Pedersen <[email protected]> +Date: Mon Jul 4 16:23:24 2011 -0400 + + Post-release version bump to 0.22.1 + commit 918a544406df8f428056daff8a634ad6eadf67c9 Author: Søren Sandmann Pedersen <[email protected]> Date: Mon May 2 05:06:33 2011 -0400 diff --git a/debian/changelog b/debian/changelog index bba59bf..8a50ac6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pixman (0.22.2-1) UNRELEASED; urgency=low + + * New upstream stable release: + - Fix glyph corruption on arm. + + -- Cyril Brulebois <[email protected]> Tue, 05 Jul 2011 13:55:16 +0200 + pixman (0.22.0-1) unstable; urgency=low * Team upload. commit 9ab7bc4623c6f6fa9012f12224fa9c33c551e374 Author: Søren Sandmann Pedersen <[email protected]> Date: Mon Jul 4 16:24:16 2011 -0400 Pre-release version bump to 0.22.2 diff --git a/configure.ac b/configure.ac index 2fe33a8..0c23831 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_PREREQ([2.57]) m4_define([pixman_major], 0) m4_define([pixman_minor], 22) -m4_define([pixman_micro], 1) +m4_define([pixman_micro], 2) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) commit 7e657586007789d25f566536e6d2bea3afdf5ec6 Author: Søren Sandmann <[email protected]> Date: Sun Jun 19 20:29:08 2011 -0400 ARM: Fix two bugs in neon_composite_over_n_8888_0565_ca(). The first bug is that a vmull.u8 instruction would store its result in the q1 register, clobbering the d2 register used later on. The second is that a vraddhn instruction would overwrite d25, corrupting the q12 register used later. Fixing the second bug caused a pipeline bubble where the d18 register would be unavailable for a clock cycle. This is fixed by swapping the instruction with its successor. diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S index 833f18c..7cddf7e 100644 --- a/pixman/pixman-arm-neon-asm.S +++ b/pixman/pixman-arm-neon-asm.S @@ -1514,11 +1514,11 @@ generate_composite_function \ * output: updated src in {d0, d1, d2 } [B, G, R] * updated mask in {d24, d25, d26} [B, G, R] */ - vmull.u8 q1, d25, d9 + vmull.u8 q6, d26, d10 vqadd.u8 q8, q0, q8 vmull.u8 q0, d24, d8 vqadd.u8 d22, d2, d22 - vmull.u8 q6, d26, d10 + vmull.u8 q1, d25, d9 /* * convert the result in d16, d17, d22 to r5g6b5 and store * it into {d28, d29} @@ -1541,6 +1541,7 @@ generate_composite_function \ vrshr.u16 q11, q12, #8 vrshr.u16 q8, q9, #8 vrshr.u16 q6, q13, #8 + vraddhn.u16 d24, q12, q11 vraddhn.u16 d25, q9, q8 /* * convert 8 r5g6b5 pixel data from {d4, d5} to planar @@ -1549,11 +1550,10 @@ generate_composite_function \ */ vshrn.u16 d17, q2, #3 vshrn.u16 d18, q2, #8 - vraddhn.u16 d24, q12, q11 vraddhn.u16 d26, q13, q6 vsli.u16 q2, q2, #5 - vsri.u8 d18, d18, #5 vsri.u8 d17, d17, #6 + vsri.u8 d18, d18, #5 /* * 'combine_over_ca' replacement * commit 134bf5c5a7ce0cf69593a14e4dc50911d0da453d Author: Andrea Canciani <[email protected]> Date: Thu May 5 10:17:08 2011 +0200 test: Fix compilation on win32 MSVC complains about uint32_t being used as an expression: composite.c(902) : error C2275: 'uint32_t' : illegal use of this type as an expression diff --git a/test/composite.c b/test/composite.c index 9a001e5..edea9a9 100644 --- a/test/composite.c +++ b/test/composite.c @@ -877,7 +877,7 @@ main (int argc, char **argv) { #define N_TESTS (8 * 1024 * 1024) int result = 0; - uint32_t i; + uint32_t i, seed; if (argc > 1) { @@ -899,8 +899,6 @@ main (int argc, char **argv) } } - uint32_t seed; - if (getenv ("PIXMAN_RANDOMIZE_TESTS")) seed = get_random_seed(); else commit 22620ea9e97d6bf73eeb74d818903e0afaf74d43 Author: Dave Yeo <[email protected]> Date: Mon May 9 12:38:44 2011 +0200 Check for working mmap() OS/2 doesn't have a working mmap(). diff --git a/configure.ac b/configure.ac index 6834f10..2fe33a8 100644 --- a/configure.ac +++ b/configure.ac @@ -650,6 +650,11 @@ fi AC_CHECK_HEADER([sys/mman.h], [AC_DEFINE(HAVE_SYS_MMAN_H, [1], [Define to 1 if we have <sys/mman.h>])]) +AC_CHECK_FUNC(mmap, have_mmap=yes, have_mmap=no) +if test x$have_mmap = xyes; then + AC_DEFINE(HAVE_MMAP, 1, [Whether we have mmap()]) +fi + AC_CHECK_FUNC(mprotect, have_mprotect=yes, have_mprotect=no) if test x$have_mprotect = xyes; then AC_DEFINE(HAVE_MPROTECT, 1, [Whether we have mprotect()]) diff --git a/test/utils.c b/test/utils.c index 56701c4..4025602 100644 --- a/test/utils.c +++ b/test/utils.c @@ -229,7 +229,7 @@ typedef struct int n_bytes; } info_t; -#if defined(HAVE_MPROTECT) && defined(HAVE_GETPAGESIZE) && defined(HAVE_SYS_MMAN_H) +#if defined(HAVE_MPROTECT) && defined(HAVE_GETPAGESIZE) && defined(HAVE_SYS_MMAN_H) && defined(HAVE_MMAP) /* This is apparently necessary on at least OS X */ #ifndef MAP_ANONYMOUS commit dd598cf73bb6bb3656f03902eabf007b9af42e59 Author: Søren Sandmann Pedersen <[email protected]> Date: Mon Jul 4 16:23:24 2011 -0400 Post-release version bump to 0.22.1 diff --git a/configure.ac b/configure.ac index 40cca58..6834f10 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_PREREQ([2.57]) m4_define([pixman_major], 0) m4_define([pixman_minor], 22) -m4_define([pixman_micro], 0) +m4_define([pixman_micro], 1) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
