[pkgsrc/trunk]: pkgsrc/x11/pixman Wow, that was quick: update to pixman-0.11...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d5c88b07773
branches:  trunk
changeset: 544694:2d5c88b07773
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Jul 18 03:34:10 2008 +0000

description:
Wow, that was quick:  update to pixman-0.11.8.  Changes:

(just a reminder: when updating this package, be sure to adjust
files/pixman.sym appropriately)

commit 411c0e990f7a96d4e15f2cbbe07d3b50b6a20f95

    Make a couple of functions static

commit 96f57c07f24cd6d86c0aad624bd1a16b85f08e04

    Speed up fbOver

    Use FbByteMulAdd to operate on two components at a time and force
    the function to be inlined.

commit dcbe4b3f80fb8dc6a83efa7e66a891f8b102608d

    fix --enable-{mmx,sse2,vmx}

    If --enable-foo is used, don't treat it as --disable-foo, and
    error out if the appropriate compiler support isn't detected.

commit e21f00db50c30e80c8969fbf63982aeb7434dc1d

    Add pixman-1-uninstalled.pc file

commit 1570746350baf82d36aeb7ea1702350700b795d7

    Use -no-undefined -- fixes bug 15927

commit 99fead412e7602daf193035831b952e252dac0e1

    Use <inttypes.h> on most types of Unix.

    Fix for bug 15560.

commit 2070f10db927a97d7d38024e607093f5a6e00291

    Remove unused pixman-combine.c

commit 9d54568d5f93701313fdbb49c1ef9dc79fe5850c

    Fix SSE2 bug where x888 pixels were treated as 8888

commit 7dfd023e94d9ab5940d7062c2e5cde11ab02f43e

    fix Altivec detection

    the old code used to cause infinite looping on G3 machines.

commit 0a92401678286eb438fe24979fd032efba540a0a

    Fix fbCompositeSrc_x888xnx8888mmx to properly ignore source alpha

commit 687176023caf53f2fe234827d152f270048b1cd3

    make --{en,dis}able-gtk work correctly

    --enable-gtk had the same effect as --disable-gtk.
    Now we check for it by default, and error out if we can't
    find it and it was explicitly enabled.

commit 9d97716d2fd91d5611a5e7a7b29b38887b672e9f

    Fix bug 16310 in the SSE2 fast path in function
    fbCompositeSolidMask_nx8888x0565Csse2

commit eb53d111bd8651cd00c1b728b09e8be09b8482f7

    Add a lossy 32-bit generic pixel fetch function for wide surfaces.

    The transformed fetch path currently only works at 32-bit precision.
    Until a wide version of that function is added, we need to have a
    path to perform a wide FetchPixel and then contract it down to
    a8r8g8b8.

    Also, use the right format when expanding the result in
    fbFetchTransformed64.  fbFetchTransformed returns a8r8g8b8 results.

commit 3c43b869f3821495978c61b9195f0b0e9e9e1245

    Unexport or delete various functions

    - Delete pixman_region_append()
    - Delete pixman_region_empty()
    - Make pixman_region_validate() static and don't export it.

    Reported by Julien Cristau.

commit 36b05f2cac7fa28e31131ca0d6b8b133ccd95ab8

    Only export the 16 bit version of pixman_region_set_static_pointers()

diffstat:

 x11/pixman/Makefile         |   7 ++++---
 x11/pixman/distinfo         |  12 ++++++------
 x11/pixman/files/pixman.sym |   7 -------
 x11/pixman/hacks.mk         |  12 ++++++++++++
 x11/pixman/patches/patch-aa |   6 +++---
 x11/pixman/patches/patch-ab |   6 +++---
 6 files changed, 28 insertions(+), 22 deletions(-)

diffs (145 lines):

diff -r a0d239807f2c -r 2d5c88b07773 x11/pixman/Makefile
--- a/x11/pixman/Makefile       Fri Jul 18 01:54:23 2008 +0000
+++ b/x11/pixman/Makefile       Fri Jul 18 03:34:10 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2008/07/14 05:31:57 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2008/07/18 03:34:10 bjs Exp $
 #
 
-DISTNAME=      pixman-0.11.6
+DISTNAME=      pixman-0.11.8
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +18,7 @@
 USE_TOOLS+=    pkg-config perl
 
 PKGCONFIG_OVERRIDE+=   pixman-1.pc.in
+PKGCONFIG_OVERRIDE+=   pixman-1-uninstalled.pc.in
 ###
 ### XXX The configure script is written to fail if it detects gcc<4.0
 ###    for lack of -fvisibility=hidden. In keeping with the pkgsrc
@@ -32,7 +33,7 @@
 
 .include "../../mk/compiler.mk"
 
-.if !empty(PKGSRC_COMPILER:Msunpro)
+.if !empty(PKGSRC_COMPILER:Msunpro) || empty(CC_VERSION:Mgcc-4.1*)
 CONFIGURE_ARGS+=       --disable-sse2
 .endif
 
diff -r a0d239807f2c -r 2d5c88b07773 x11/pixman/distinfo
--- a/x11/pixman/distinfo       Fri Jul 18 01:54:23 2008 +0000
+++ b/x11/pixman/distinfo       Fri Jul 18 03:34:10 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2008/07/13 23:16:02 bjs Exp $
+$NetBSD: distinfo,v 1.16 2008/07/18 03:34:10 bjs Exp $
 
-SHA1 (pixman-0.11.6.tar.bz2) = 9ee97f75d98678d50d4a400a9266bf05d3835481
-RMD160 (pixman-0.11.6.tar.bz2) = 0b9e7a1f8b5f724d6cb374a6ab467211c01fc880
-Size (pixman-0.11.6.tar.bz2) = 359630 bytes
-SHA1 (patch-aa) = dbb1a2ef0c8f9db1e4897b60b3c8b6dc8a44dd39
-SHA1 (patch-ab) = 41634a1a885fcf08800073ccd094db4f02020e3a
+SHA1 (pixman-0.11.8.tar.bz2) = 8db43d9fe094073cfcb03c1b1c86296b5a7df1aa
+RMD160 (pixman-0.11.8.tar.bz2) = c1a69a2110b09c0af2bbc05637e74eebdfa7a120
+Size (pixman-0.11.8.tar.bz2) = 360229 bytes
+SHA1 (patch-aa) = 70ed22b9c271e3329344719f575e3bf6ec6d9f89
+SHA1 (patch-ab) = d62794cb2bd230628fa3f263253b39ab106c943f
 SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af
 SHA1 (patch-ad) = c7fe169e062bbdc58db484874409a502f0f80018
 SHA1 (patch-ae) = 007f2487b53975eb10550b6540650a220e6b60d8
diff -r a0d239807f2c -r 2d5c88b07773 x11/pixman/files/pixman.sym
--- a/x11/pixman/files/pixman.sym       Fri Jul 18 01:54:23 2008 +0000
+++ b/x11/pixman/files/pixman.sym       Fri Jul 18 03:34:10 2008 +0000
@@ -35,11 +35,9 @@
 pixman_line_fixed_edge_init
 pixman_rasterize_edges
 pixman_rasterize_trapezoid
-pixman_region32_append
 pixman_region32_contains_point
 pixman_region32_contains_rectangle
 pixman_region32_copy
-pixman_region32_empty
 pixman_region32_equal
 pixman_region32_extents
 pixman_region32_fini
@@ -54,17 +52,13 @@
 pixman_region32_rectangles
 pixman_region32_reset
 pixman_region32_selfcheck
-pixman_region32_set_static_pointers
 pixman_region32_subtract
 pixman_region32_translate
 pixman_region32_union
 pixman_region32_union_rect
-pixman_region32_validate
-pixman_region_append
 pixman_region_contains_point
 pixman_region_contains_rectangle
 pixman_region_copy
-pixman_region_empty
 pixman_region_equal
 pixman_region_extents
 pixman_region_fini
@@ -84,7 +78,6 @@
 pixman_region_translate
 pixman_region_union
 pixman_region_union_rect
-pixman_region_validate
 pixman_sample_ceil_y
 pixman_sample_floor_y
 pixman_transform_point_3d
diff -r a0d239807f2c -r 2d5c88b07773 x11/pixman/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/pixman/hacks.mk       Fri Jul 18 03:34:10 2008 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: hacks.mk,v 1.1 2008/07/18 03:34:10 bjs Exp $
+#
+.if !defined(PIXMAN_HACKS_MK)
+PIXMAN_HACKS_MK=       # empty
+.  include "../../mk/compiler.mk"
+###
+### XXX SSE2 intrinsics require gcc-4.2+ to build.
+###
+.  if !empty(PKGSRC_COMPILER:Msunpro) || empty(CC_VERSION:Mgcc-4.2*)
+CONFIGURE_ARGS+=       --disable-sse2
+.  endif
+.endif
diff -r a0d239807f2c -r 2d5c88b07773 x11/pixman/patches/patch-aa
--- a/x11/pixman/patches/patch-aa       Fri Jul 18 01:54:23 2008 +0000
+++ b/x11/pixman/patches/patch-aa       Fri Jul 18 03:34:10 2008 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.7 2008/06/19 17:51:27 bjs Exp $
+$NetBSD: patch-aa,v 1.8 2008/07/18 03:34:10 bjs Exp $
 
 --- pixman/Makefile.am.orig    2008-06-09 01:56:58.000000000 -0400
 +++ pixman/Makefile.am
 @@ -1,5 +1,6 @@
  lib_LTLIBRARIES = libpixman-1.la
--libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
+-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined
++libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined \
 +      -export-symbols $(PIXMAN_SYMFILE)
  libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
  libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED
diff -r a0d239807f2c -r 2d5c88b07773 x11/pixman/patches/patch-ab
--- a/x11/pixman/patches/patch-ab       Fri Jul 18 01:54:23 2008 +0000
+++ b/x11/pixman/patches/patch-ab       Fri Jul 18 03:34:10 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2008/06/19 17:51:27 bjs Exp $
+$NetBSD: patch-ab,v 1.7 2008/07/18 03:34:10 bjs Exp $
 
 --- pixman/Makefile.in.orig    2008-06-09 12:35:15.000000000 -0400
 +++ pixman/Makefile.in
@@ -6,8 +6,8 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  lib_LTLIBRARIES = libpixman-1.la
--libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
+-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined
++libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined \
 +      -export-symbols $(PIXMAN_SYMFILE)
  libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_2) $(am__append_4) \
        $(am__append_6)