diff -Nru pixman-0.18.2/ChangeLog pixman-0.18.4/ChangeLog --- pixman-0.18.2/ChangeLog 2010-09-08 15:45:51.000000000 +0200 +++ pixman-0.18.4/ChangeLog 2010-09-08 15:45:51.000000000 +0200 @@ -1,3 +1,48 @@ +commit 97336fad32acf802003855cd8bd6477fa49a12e3 +Author: Søren Sandmann Pedersen +Date: Mon Aug 16 06:34:53 2010 -0400 + + Pre-release version bump to 0.18.4 + +commit 32509aa4da83565a1283375c7043348c63ac3d3a +Author: Søren Sandmann Pedersen +Date: Mon Jul 12 15:13:49 2010 -0400 + + Check for read accessors before taking the bilinear fast path + + The bilinear fast path accesses pixels directly, so if the image has a + read accessor, then it can't be used. + +commit 052c5b819cfcdc5e63adb5b9117db939674ca5c2 +Author: Søren Sandmann Pedersen +Date: Wed Jul 28 03:17:35 2010 -0400 + + If we bail out of do_composite, make sure to undo any workarounds. + + The workaround for an old X bug has to be undone if we bail from + do_composite, so we can't just return. + +commit 91cb1421770a7d654555069946f9e998999a5813 +Author: Søren Sandmann Pedersen +Date: Sun May 30 16:52:09 2010 -0400 + + When storing a g1 pixel, store the lowest bit, rather than comparing with 0. + +commit a9a084c85cc0da15bfdf15a0a8363dd24c77f023 +Author: Søren Sandmann Pedersen +Date: Wed Jun 30 02:31:10 2010 -0400 + + Fix memory leak in the pthreads thread local storage code + + When a thread exits, we leak whatever is stored in thread local + variables, so install a destructor to free it. + +commit 872c915dcb6cf74130ea87e1b46d6a38535d98b0 +Author: Søren Sandmann Pedersen +Date: Wed May 12 16:33:35 2010 -0400 + + Post-release version bump to 0.18.3 + commit b48d8b5201ab010f75f36bccd101cf60510d4ef2 Author: Søren Sandmann Pedersen Date: Wed May 12 16:27:02 2010 -0400 diff -Nru pixman-0.18.2/configure pixman-0.18.4/configure --- pixman-0.18.2/configure 2010-05-12 22:26:22.000000000 +0200 +++ pixman-0.18.4/configure 2010-08-16 12:35:04.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for pixman 0.18.2. +# Generated by GNU Autoconf 2.65 for pixman 0.18.4. # # Report bugs to <"pixman@lists.freedesktop.org">. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='pixman' PACKAGE_TARNAME='pixman' -PACKAGE_VERSION='0.18.2' -PACKAGE_STRING='pixman 0.18.2' +PACKAGE_VERSION='0.18.4' +PACKAGE_STRING='pixman 0.18.4' PACKAGE_BUGREPORT='"pixman@lists.freedesktop.org"' PACKAGE_URL='' @@ -1466,7 +1466,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pixman 0.18.2 to adapt to many kinds of systems. +\`configure' configures pixman 0.18.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1536,7 +1536,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pixman 0.18.2:";; + short | recursive ) echo "Configuration of pixman 0.18.4:";; esac cat <<\_ACEOF @@ -1651,7 +1651,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pixman configure 0.18.2 +pixman configure 0.18.4 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2146,7 +2146,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pixman $as_me 0.18.2, which was +It was created by pixman $as_me 0.18.4, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2954,7 +2954,7 @@ # Define the identity of the package. PACKAGE='pixman' - VERSION='0.18.2' + VERSION='0.18.4' cat >>confdefs.h <<_ACEOF @@ -11086,13 +11086,13 @@ -LT_VERSION_INFO="18:2:18" +LT_VERSION_INFO="18:4:18" PIXMAN_VERSION_MAJOR=0 PIXMAN_VERSION_MINOR=18 -PIXMAN_VERSION_MICRO=2 +PIXMAN_VERSION_MICRO=4 @@ -12561,7 +12561,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pixman $as_me 0.18.2, which was +This file was extended by pixman $as_me 0.18.4, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12627,7 +12627,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pixman config.status 0.18.2 +pixman config.status 0.18.4 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru pixman-0.18.2/configure.ac pixman-0.18.4/configure.ac --- pixman-0.18.2/configure.ac 2010-05-12 22:26:16.000000000 +0200 +++ pixman-0.18.4/configure.ac 2010-08-16 12:34:42.000000000 +0200 @@ -54,7 +54,7 @@ m4_define([pixman_major], 0) m4_define([pixman_minor], 18) -m4_define([pixman_micro], 2) +m4_define([pixman_micro], 4) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) diff -Nru pixman-0.18.2/debian/changelog pixman-0.18.4/debian/changelog --- pixman-0.18.2/debian/changelog 2010-09-08 15:45:51.000000000 +0200 +++ pixman-0.18.4/debian/changelog 2010-09-08 15:45:51.000000000 +0200 @@ -1,10 +1,9 @@ -pixman (0.18.2-1ubuntu1) maverick; urgency=low +pixman (0.18.4-1) experimental; urgency=low - * Add 100_check_read_accessor.patch: Fixes corruption seen in firefox - due to REPEAT_NONE for a XRGB source fallback being triggered in a - composite operation. (LP: #608613) + [ Robert Hooker ] + * New upstream stable release. - -- Robert Hooker Sun, 15 Aug 2010 12:54:32 -0400 + -- Julien Cristau Mon, 06 Sep 2010 21:15:07 +0200 pixman (0.18.2-1) experimental; urgency=low @@ -34,20 +33,6 @@ -- Julien Cristau Tue, 11 May 2010 14:16:09 +0200 -pixman (0.16.4-1ubuntu2) lucid; urgency=low - - * Drop patch I left around in a working tree. - - -- Loïc Minier Tue, 09 Mar 2010 21:35:14 +0100 - -pixman (0.16.4-1ubuntu1) lucid; urgency=low - - * Add 100-pixman-arm-simd-fix.patch: Fixes ARM SIMD support detection - failing at compile time when -mthumb is a toolchain default. - (LP: #535183) - - -- Robert Hooker Tue, 09 Mar 2010 15:07:53 -0500 - pixman (0.16.4-1) unstable; urgency=low * New upstream release. @@ -223,4 +208,3 @@ * First upload (closes: 428774). -- Julien Cristau Wed, 01 Aug 2007 13:24:36 +0200 - diff -Nru pixman-0.18.2/debian/control pixman-0.18.4/debian/control --- pixman-0.18.2/debian/control 2010-09-08 15:45:51.000000000 +0200 +++ pixman-0.18.4/debian/control 2010-09-08 15:45:51.000000000 +0200 @@ -1,8 +1,7 @@ Source: pixman Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian X Strike Force +Maintainer: Debian X Strike Force Uploaders: David Nusinow Build-Depends: debhelper (>= 5), automake, autoconf, libtool, pkg-config, quilt Standards-Version: 3.8.3 diff -Nru pixman-0.18.2/debian/patches/100_check_read_accessors.patch pixman-0.18.4/debian/patches/100_check_read_accessors.patch --- pixman-0.18.2/debian/patches/100_check_read_accessors.patch 2010-09-08 15:45:51.000000000 +0200 +++ pixman-0.18.4/debian/patches/100_check_read_accessors.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -From 9897bb4eeed165b76001dfefd3a89bcb96d38a72 Mon Sep 17 00:00:00 2001 -From: Søren Sandmann Pedersen -Date: Mon, 12 Jul 2010 19:13:49 +0000 -Subject: Check for read accessors before taking the bilinear fast path - -The bilinear fast path accesses pixels directly, so if the image has a -read accessor, then it can't be used. ---- -diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c -index ff59a8f..95710b4 100644 ---- a/pixman/pixman-bits-image.c -+++ b/pixman/pixman-bits-image.c -@@ -909,6 +909,7 @@ bits_image_property_changed (pixman_image_t *image) - bits->common.transform->matrix[2][2] == pixman_fixed_1 && - bits->common.transform->matrix[0][0] > 0 && - bits->common.transform->matrix[1][0] == 0 && -+ !bits->read_func && - (bits->common.filter == PIXMAN_FILTER_BILINEAR || - bits->common.filter == PIXMAN_FILTER_GOOD || - bits->common.filter == PIXMAN_FILTER_BEST) && --- -cgit v0.8.3-6-g21f6 diff -Nru pixman-0.18.2/debian/patches/series pixman-0.18.4/debian/patches/series --- pixman-0.18.2/debian/patches/series 2010-09-08 15:45:51.000000000 +0200 +++ pixman-0.18.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -100_check_read_accessors.patch diff -Nru pixman-0.18.2/pixman/pixman-access.c pixman-0.18.4/pixman/pixman-access.c --- pixman-0.18.2/pixman/pixman-access.c 2010-05-12 22:13:49.000000000 +0200 +++ pixman-0.18.4/pixman/pixman-access.c 2010-08-16 12:28:39.000000000 +0200 @@ -2640,7 +2640,7 @@ #else mask = 1 << ((i + x) & 0x1f); #endif - v = RGB24_TO_ENTRY_Y (indexed, values[i]) ? mask : 0; + v = RGB24_TO_ENTRY_Y (indexed, values[i]) & 0x1 ? mask : 0; WRITE (image, pixel, (READ (image, pixel) & ~mask) | v); } diff -Nru pixman-0.18.2/pixman/pixman-bits-image.c pixman-0.18.4/pixman/pixman-bits-image.c --- pixman-0.18.2/pixman/pixman-bits-image.c 2010-05-12 22:13:49.000000000 +0200 +++ pixman-0.18.4/pixman/pixman-bits-image.c 2010-08-16 12:28:39.000000000 +0200 @@ -914,6 +914,7 @@ bits->common.transform->matrix[2][2] == pixman_fixed_1 && bits->common.transform->matrix[0][0] > 0 && bits->common.transform->matrix[1][0] == 0 && + !bits->read_func && (bits->common.filter == PIXMAN_FILTER_BILINEAR || bits->common.filter == PIXMAN_FILTER_GOOD || bits->common.filter == PIXMAN_FILTER_BEST) && diff -Nru pixman-0.18.2/pixman/pixman.c pixman-0.18.4/pixman/pixman.c --- pixman-0.18.2/pixman/pixman.c 2010-05-12 22:13:49.000000000 +0200 +++ pixman-0.18.4/pixman/pixman.c 2010-08-16 12:28:39.000000000 +0200 @@ -634,7 +634,7 @@ ®ion, src, mask, dest, src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height)) { - return; + goto out; } extents = pixman_region32_extents (®ion); @@ -651,7 +651,7 @@ */ op = optimize_operator (op, src_flags, mask_flags, dest_flags); if (op == PIXMAN_OP_DST) - return; + goto out; /* Check cache for fast paths */ cache = PIXMAN_GET_THREAD_LOCAL (fast_path_cache); diff -Nru pixman-0.18.2/pixman/pixman-compiler.h pixman-0.18.4/pixman/pixman-compiler.h --- pixman-0.18.2/pixman/pixman-compiler.h 2010-05-12 22:15:42.000000000 +0200 +++ pixman-0.18.4/pixman/pixman-compiler.h 2010-08-16 12:28:39.000000000 +0200 @@ -158,9 +158,16 @@ static pthread_key_t tls_ ## name ## _key; \ \ static void \ + tls_ ## name ## _destroy_value (void *value) \ + { \ + free (value); \ + } \ + \ + static void \ tls_ ## name ## _make_key (void) \ { \ - pthread_key_create (&tls_ ## name ## _key, NULL); \ + pthread_key_create (&tls_ ## name ## _key, \ + tls_ ## name ## _destroy_value); \ } \ \ static type * \ diff -Nru pixman-0.18.2/pixman/pixman-version.h pixman-0.18.4/pixman/pixman-version.h --- pixman-0.18.2/pixman/pixman-version.h 2010-05-12 22:27:28.000000000 +0200 +++ pixman-0.18.4/pixman/pixman-version.h 2010-08-16 12:35:09.000000000 +0200 @@ -33,9 +33,9 @@ #define PIXMAN_VERSION_MAJOR 0 #define PIXMAN_VERSION_MINOR 18 -#define PIXMAN_VERSION_MICRO 2 +#define PIXMAN_VERSION_MICRO 4 -#define PIXMAN_VERSION_STRING "0.18.2" +#define PIXMAN_VERSION_STRING "0.18.4" #define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \ ((major) * 10000) \ diff -Nru pixman-0.18.2/test/blitters-test.c pixman-0.18.4/test/blitters-test.c --- pixman-0.18.2/test/blitters-test.c 2010-05-12 22:15:41.000000000 +0200 +++ pixman-0.18.4/test/blitters-test.c 2010-08-16 12:28:39.000000000 +0200 @@ -482,7 +482,7 @@ /* Predefined value for running with all the fastpath functions disabled. It needs to be updated every time when changes are introduced to this program or behavior of pixman changes! */ - if (crc == 0x8F9F7DC1) + if (crc == 0xBBACC28D) { printf ("blitters test passed\n"); }