Sun Jul 13 23:16:02 2008 UTC ()
Update to pixman-0.11.6.  ChangeLog:

commit a766b62880108f278478888f5167a5fbf2819a97

    Add configure time options to disable mmx/sse2/vmx

commit 02268903e4311709744c11e495f9b17f171ec5e9

    pixman-sse.c: silence pointer-cast compiler warnings.

    Cast pointers to words of the same size, not 32-bits.

commit eb2d95de98683a387153f010077ad9c3c3b1b01d

    Fix implicit declaration of function 'free'.

    Otherwise pointer will be truncated on 64bit arch and
    your programs will crash.

commit 29d144712e558aaeb49f4384028dd669d76a410b

    Fix memory leak by freeing boxes{16,32}.

    After calling pixman_region_init_rects() or
    pixman_region32_init_rects(), boxes{16,32} were not freed before
    returning. Fixes bug 16312.

commit 5d32519316b40b35113c6df9e15d955a16709ba2

    Use pixman_malloc_ab instead of plain malloc for the
    fbStore64_generic scratch buffer.

commit b1c70c4e6435d7f15751111828c381feb1d139cf

    Move PIXMAN_FORMAT_16BPC to pixman-private.h

commit 7fa966df0ee781fa486715710f389b148c11d36e

    Decide based on the image formats whether we need wide compositing.

commit 7cb735c9c0fa55ae1f4d8d13da9f33e3da2ae8fe

    Take the source format into account in pixman_expand.

    Extract the original bits of the source image for each
    component and then replicate up to 16 bits to fill the wide
    components.  Make sure to hard-code the alpha value to 1 if
    the source format didn't have alpha.

commit c0d98e96605c6d03f4b02f337f2f5827165bb092

    Make expansion and contraction loops clearer.

commit fc0b28bf6af81428b7ac045614eea97fbf9c4a70

    Add wide source picture, external alpha, and transformed
    image routines.  The wide external alpha path should work
    correctly with wide formats.  The wide transformed fetch code for
    now just does a 32-bit fetch and then expands, which will lose
    precision.  Source pictures, for now, are evaluated at depth 32
    and then are expanded to depth 64.  We could get higher precision
    by evaluating them directly at depth 64, but this should be good
    enough for now.

commit 42a3a2d6fc8d3e521c6914ff8fb89f1fbc673e28

    Add wide fetch/store functions.

    Use the narrow ones and expand/contract where necessary.  Still
    need wide paths for fancy pictures, but this gets the
    basic stuff working.

commit 7591d3f1d7e0884f9362018edf720724095cf380

    Add expand and contract functions to convert between ARGB8
    and ARGB16.  The expansion function isn't quite correct,
    but gives reasonable results.


(bjs)
diff -r1.13 -r1.14 pkgsrc/x11/pixman/Makefile
diff -r1.14 -r1.15 pkgsrc/x11/pixman/distinfo
diff -r1.4 -r1.5 pkgsrc/x11/pixman/patches/patch-ae

cvs diff -r1.13 -r1.14 pkgsrc/x11/pixman/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/pixman/Makefile 2008/06/19 17:59:52 1.13
+++ pkgsrc/x11/pixman/Makefile 2008/07/13 23:16:02 1.14
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.13 2008/06/19 17:59:52 bjs Exp $ 1# $NetBSD: Makefile,v 1.14 2008/07/13 23:16:02 bjs Exp $
2# 2#
3 3
4DISTNAME= pixman-0.11.4 4DISTNAME= pixman-0.11.6
5PKGNAME= ${DISTNAME:C/pl[0-9]*//} 
6CATEGORIES= x11 5CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
 9
10MAINTAINER= bjs@NetBSD.org 10MAINTAINER= bjs@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= Library of low-level pixel manipulation routines 12COMMENT= Library of low-level pixel manipulation routines
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config perl 18USE_TOOLS+= pkg-config perl
19 19
20PKGCONFIG_OVERRIDE+= pixman-1.pc.in 20PKGCONFIG_OVERRIDE+= pixman-1.pc.in
21### 21###
22### XXX The configure script is written to fail if it detects gcc<4.0 22### XXX The configure script is written to fail if it detects gcc<4.0
23### for lack of -fvisibility=hidden. In keeping with the pkgsrc 23### for lack of -fvisibility=hidden. In keeping with the pkgsrc
24### tradition of portability, we'll opt to use libtool to export 24### tradition of portability, we'll opt to use libtool to export
25### the desired symbols, hiding the rest. 25### the desired symbols, hiding the rest.
26### 26###
27### I have verified the list of visible symbols is unchanged from 27### I have verified the list of visible symbols is unchanged from
28### the "factory" build. 28### the "factory" build.
29### 29###
 30MAKE_ENV+= PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
30PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym 31PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym
31MAKE_ENV+= PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q} 
32 32
33post-extract: 33post-extract:
34 ${CP} ${FILESDIR}/pixman.sym ${WRKDIR} 34 ${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
35 35
36.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"

cvs diff -r1.14 -r1.15 pkgsrc/x11/pixman/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/pixman/distinfo 2008/07/12 15:34:48 1.14
+++ pkgsrc/x11/pixman/distinfo 2008/07/13 23:16:02 1.15
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.14 2008/07/12 15:34:48 tnn Exp $ 1$NetBSD: distinfo,v 1.15 2008/07/13 23:16:02 bjs Exp $
2 2
3SHA1 (pixman-0.11.4.tar.bz2) = e74dfcc6435edf7a397e8c42ffb4d581484e05d3 3SHA1 (pixman-0.11.6.tar.bz2) = 9ee97f75d98678d50d4a400a9266bf05d3835481
4RMD160 (pixman-0.11.4.tar.bz2) = 000ec544e1c25b6ef955eed098c3906b095e10d5 4RMD160 (pixman-0.11.6.tar.bz2) = 0b9e7a1f8b5f724d6cb374a6ab467211c01fc880
5Size (pixman-0.11.4.tar.bz2) = 330235 bytes 5Size (pixman-0.11.6.tar.bz2) = 359630 bytes
6SHA1 (patch-aa) = dbb1a2ef0c8f9db1e4897b60b3c8b6dc8a44dd39 6SHA1 (patch-aa) = dbb1a2ef0c8f9db1e4897b60b3c8b6dc8a44dd39
7SHA1 (patch-ab) = 41634a1a885fcf08800073ccd094db4f02020e3a 7SHA1 (patch-ab) = 41634a1a885fcf08800073ccd094db4f02020e3a
8SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af 8SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af
9SHA1 (patch-ad) = c7fe169e062bbdc58db484874409a502f0f80018 9SHA1 (patch-ad) = c7fe169e062bbdc58db484874409a502f0f80018
10SHA1 (patch-ae) = cf6ce4df1d116711db6e5051e513ea2dfc121dba 10SHA1 (patch-ae) = 007f2487b53975eb10550b6540650a220e6b60d8

cvs diff -r1.4 -r1.5 pkgsrc/x11/pixman/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/pixman/patches/Attic/patch-ae 2008/07/12 15:34:49 1.4
+++ pkgsrc/x11/pixman/patches/Attic/patch-ae 2008/07/13 23:16:02 1.5
@@ -1,37 +1,21 @@ @@ -1,37 +1,21 @@
1$NetBSD: patch-ae,v 1.4 2008/07/12 15:34:49 tnn Exp $ 1$NetBSD: patch-ae,v 1.5 2008/07/13 23:16:02 bjs Exp $
2 2
3--- configure.orig 2008-06-09 18:35:16.000000000 +0200 3--- configure.orig 2008-06-25 07:55:10.000000000 -0400
4+++ configure 4+++ configure
5@@ -19770,6 +19770,7 @@ fi 5@@ -19773,6 +19773,7 @@ fi
6  6
7  7
8 have_gcc4=no 8 have_gcc4=no
9+if false; then 9+if false; then
10 { echo "$as_me:$LINENO: checking for -fvisibility" >&5 10 { echo "$as_me:$LINENO: checking for -fvisibility" >&5
11 echo $ECHO_N "checking for -fvisibility... $ECHO_C" >&6; } 11 echo $ECHO_N "checking for -fvisibility... $ECHO_C" >&6; }
12 cat >conftest.$ac_ext <<_ACEOF 12 cat >conftest.$ac_ext <<_ACEOF
13@@ -19807,7 +19808,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 13@@ -19810,7 +19811,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
14 fi 14 fi
15  15
16 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 16 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17- 17-
18+fi 18+fi
19 if test "x$have_gcc4" = "xyes"; then 19 if test "x$have_gcc4" = "xyes"; then
20 CFLAGS="$CFLAGS -fvisibility=hidden" 20 CFLAGS="$CFLAGS -fvisibility=hidden"
21 fi 21 fi
22@@ -19969,6 +19970,7 @@ fi 
23 have_sse2_intrinsics=no 
24 { echo "$as_me:$LINENO: checking whether to use SSE2 intrinsics" >&5 
25 echo $ECHO_N "checking whether to use SSE2 intrinsics... $ECHO_C" >&6; } 
26+if test $have_sse_intrinsics = yes; then 
27 xserver_save_CFLAGS=$CFLAGS 
28 CFLAGS="$CFLAGS -msse2 $SSE_CFLAGS" 
29  
30@@ -20013,6 +20015,7 @@ fi 
31  
32 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 
33 CFLAGS=$xserver_save_CFLAGS 
34+fi 
35 { echo "$as_me:$LINENO: result: $have_sse2_intrinsics" >&5 
36 echo "${ECHO_T}$have_sse2_intrinsics" >&6; } 
37