Update to 0.26.2. meta-pkgs/modular-xorg still builds.

0.26.2:
A new pixman release 0.26.2 is now available. This is a stable release. It
contains some bug fixes, custom build rules for ARM/iwMMXt, and an important
bug fix for MMX/x86.

0.26.0:
A new stable pixman release 0.26.0 is now available. Highlights of
this release:

 * New support for MIPS DSPr2 ASE. [Nemanja Lukic]

 * Improved performance with the iwMMXt instruction set. [Matt Turner]

 * New support for the Loongson SIMD instruction set. [Matt]
   Performance results from a number of cairo based benchmarks:

          Benchmark                           Improvement

          evolution .............. image:         12.8 %
                                 image16:         15.9 %
          firefox-planet-gnome ... image:         14.4 %
                                 image16:         10.0 %
          gnome-terminal-vim ..... image:         16.5 %
                                 image16:         15.7 %
          gvim ................... image:         13.1 %
                                 image16:          7.0 %
          ocitysmap .............. image:         24.1 %
                                 image16:         23.9 %
          poppler ................ image:         18.7 %
                                 image16:         17.5 %
          swfdec-giant-steps ..... image:      no change
                                 image16:         35.3 %
          swfdec-youtube ......... image:         23.5 %
                                 image16:         12.4 %
          xfce4-terminal-a1 ...... image:         26.9 %
                                 image16:         28.8 %

   Please see

      http://mattst88.com/blog/2012/05/17/Optimizing%20pixman%20for%20Loongson:%20Process%20and%20Results/

   for more information.

In addition to a number of bug fixes, cleanups and performance
improvements, this release also contains improved support for Android
and iOS thanks to Bobby Salazar.

Thanks to everybody who contributed to pixman 0.26.0, including Alan
Coopersmith, Andrea Canciani, Bobby Salazar, Chun-wei Fan, Colin
Walters, Ingmar Runge, Jeremy Huddleston, Matt Turner, Naohiro Aota,
Nemanja Lukic, and Søren Sandmann Pedersen.

8 files changed, 10 insertions, 277 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index be2ab1ae7d6..00df87d1ac3 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2012/05/15 18:59:07 tron Exp $
+# $NetBSD: Makefile,v 1.48 2012/07/14 20:49:30 wiz Exp $
 
-DISTNAME=	pixman-0.24.4
-PKGREVISION=	1
+DISTNAME=	pixman-0.26.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,31 +15,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config perl
-###
-### XXX Quiet, please!
-###
-.if empty(USE_TOOLS:Mauto*)
-CONFIGURE_ENV+=	AUTOCONF=${TRUE:Q}
-CONFIGURE_ENV+=	AUTOHEADER=${TRUE:Q}
-CONFIGURE_ENV+=	ACLOCAL=${TRUE:Q}
-CONFIGURE_ENV+=	AUTOMAKE=${TRUE:Q}
-.endif
 
 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
-###	tradition of portability, we'll opt to use libtool to export
-###	the desired symbols, hiding the rest.
-###
-###	Please, do not forget to ensure the currency of this file!
-
-MAKE_ENV+=	PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
-PIXMAN_SYMFILE=	${WRKDIR}/pixman.sym
-
-post-extract:
-	${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
-	${CP} ${FILESDIR}/solaris-hwcap.mapfile ${WRKSRC}/pixman
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 55673aaa72c..302be37effe 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.45 2012/05/12 17:38:32 wiz Exp $
+$NetBSD: distinfo,v 1.46 2012/07/14 20:49:30 wiz Exp $
 
-SHA1 (pixman-0.24.4.tar.bz2) = 683450f917015366ac7918fc517c76801aeff374
-RMD160 (pixman-0.24.4.tar.bz2) = 1df92f83b0b944e8a493a8cdf6318ebc6e778914
-Size (pixman-0.24.4.tar.bz2) = 468400 bytes
-SHA1 (patch-aa) = 7096dcb1f999ad4c9c0797bbdc5a4dd1f994275d
-SHA1 (patch-ab) = 85ece7667c4c24adf92c1a2ec25bb2e12e83d0e4
-SHA1 (patch-ad) = 2841fb543df1a180a263a770d1934924a4648d8d
-SHA1 (patch-af) = 76a94e09758f1d6e3055430c82fbcdaaefe0436d
+SHA1 (pixman-0.26.2.tar.bz2) = 1daf014714cc29147726abada12359345d156705
+RMD160 (pixman-0.26.2.tar.bz2) = a799dc2cf6f526c2f59e810e3b9a1c73df55fc2d
+Size (pixman-0.26.2.tar.bz2) = 622398 bytes
+SHA1 (patch-af) = 49eccff278ca41fe646cf813416c836b603b08b2
 SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23
 SHA1 (patch-bb) = bf9a4725e5dc20af7cafbedd212f6e2e2d78fa71
 SHA1 (patch-bc) = 7e1ba2de0c29a8f89f3549f4b3b8d1dd9e4fbaa5
diff --git a/x11/pixman/files/pixman.sym b/x11/pixman/files/pixman.sym
deleted file mode 100644
index a6cf7d027ee..00000000000
--- a/x11/pixman/files/pixman.sym
+++ /dev/null
@@ -1,140 +0,0 @@
-_pixman_addition_overflows_int
-_pixman_multiply_overflows_int
-pixman_add_trapezoids
-pixman_add_traps
-pixman_add_triangles
-pixman_blt
-pixman_composite_trapezoids
-pixman_composite_triangles
-pixman_compute_composite_region
-pixman_contract
-pixman_disable_out_of_bounds_workaround
-pixman_edge_init
-pixman_edge_step
-pixman_expand
-pixman_f_transform_bounds
-pixman_f_transform_from_pixman_transform
-pixman_f_transform_init_identity
-pixman_f_transform_init_rotate
-pixman_f_transform_init_scale
-pixman_f_transform_init_translate
-pixman_f_transform_invert
-pixman_f_transform_multiply
-pixman_f_transform_point
-pixman_f_transform_point_3d
-pixman_f_transform_rotate
-pixman_f_transform_scale
-pixman_f_transform_translate
-pixman_fill
-pixman_fill_mmx
-pixman_format_supported_destination
-pixman_format_supported_source
-pixman_image_composite
-pixman_image_composite32
-pixman_image_create_bits
-pixman_image_create_conical_gradient
-pixman_image_create_linear_gradient
-pixman_image_create_radial_gradient
-pixman_image_create_solid_fill
-pixman_image_fill_boxes
-pixman_image_fill_rectangles
-pixman_image_get_component_alpha
-pixman_image_get_data
-pixman_image_get_depth
-pixman_image_get_destroy_data
-pixman_image_get_format
-pixman_image_get_height
-pixman_image_get_stride
-pixman_image_get_width
-pixman_image_ref
-pixman_image_set_accessors
-pixman_image_set_alpha_map
-pixman_image_set_clip_region
-pixman_image_set_clip_region32
-pixman_image_set_component_alpha
-pixman_image_set_destroy_function
-pixman_image_set_filter
-pixman_image_set_has_client_clip
-pixman_image_set_indexed
-pixman_image_set_repeat
-pixman_image_set_source_clipping
-pixman_image_set_transform
-pixman_image_unref
-pixman_line_fixed_edge_init
-pixman_malloc_ab
-pixman_malloc_abc
-pixman_rasterize_edges
-pixman_rasterize_edges_accessors
-pixman_rasterize_trapezoid
-pixman_region16_copy_from_region32
-pixman_region32_contains_point
-pixman_region32_contains_rectangle
-pixman_region32_copy
-pixman_region32_copy_from_region16
-pixman_region32_equal
-pixman_region32_extents
-pixman_region32_fini
-pixman_region32_init
-pixman_region32_init_from_image
-pixman_region32_init_rect
-pixman_region32_init_rects
-pixman_region32_init_with_extents
-pixman_region32_intersect
-pixman_region32_intersect_rect
-pixman_region32_inverse
-pixman_region32_n_rects
-pixman_region32_not_empty
-pixman_region32_print
-pixman_region32_rectangles
-pixman_region32_reset
-pixman_region32_selfcheck
-pixman_region32_subtract
-pixman_region32_translate
-pixman_region32_union
-pixman_region32_union_rect
-pixman_region_contains_point
-pixman_region_contains_rectangle
-pixman_region_copy
-pixman_region_equal
-pixman_region_extents
-pixman_region_fini
-pixman_region_init
-pixman_region_init_from_image
-pixman_region_init_rect
-pixman_region_init_rects
-pixman_region_init_with_extents
-pixman_region_intersect
-pixman_region_intersect_rect
-pixman_region_inverse
-pixman_region_n_rects
-pixman_region_not_empty
-pixman_region_print
-pixman_region_rectangles
-pixman_region_reset
-pixman_region_selfcheck
-pixman_region_set_static_pointers
-pixman_region_subtract
-pixman_region_translate
-pixman_region_union
-pixman_region_union_rect
-pixman_sample_ceil_y
-pixman_sample_floor_y
-pixman_transform_bounds
-pixman_transform_from_pixman_f_transform
-pixman_transform_init_identity
-pixman_transform_init_rotate
-pixman_transform_init_scale
-pixman_transform_init_translate
-pixman_transform_invert
-pixman_transform_is_identity
-pixman_transform_is_int_translate
-pixman_transform_is_inverse
-pixman_transform_is_scale
-pixman_transform_multiply
-pixman_transform_point
-pixman_transform_point_3d
-pixman_transform_rotate
-pixman_transform_scale
-pixman_transform_translate
-pixman_version
-pixman_version_string
diff --git a/x11/pixman/files/solaris-hwcap.mapfile b/x11/pixman/files/solaris-hwcap.mapfile
deleted file mode 100644
index 7f439a95a7f..00000000000
--- a/x11/pixman/files/solaris-hwcap.mapfile
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###############################################################################
-#
-# Override the linker's detection of CMOV/MMX/SSE instructions so this
-# library isn't flagged as only usable on CPU's with those ISA's, since it
-# checks at runtime for availability before calling them
-
-hwcap_1 = V0x0 FPU OVERRIDE;
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
deleted file mode 100644
index 65cb2633421..00000000000
--- a/x11/pixman/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2012/05/12 17:38:32 wiz Exp $
-
---- pixman/Makefile.am.orig	2012-01-27 15:45:27.000000000 +0000
-+++ pixman/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/pixman/Makefile.so
- 
- lib_LTLIBRARIES = libpixman-1.la
- 
--libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined @PTHREAD_LDFLAGS@ 
-+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined @PTHREAD_LDFLAGS@ -export-symbols $(PIXMAN_SYMFILE)
- libpixman_1_la_LIBADD = @PTHREAD_LIBS@ @DEP_LIBS@ -lm
- libpixman_1_la_SOURCES = $(libpixman_sources) $(libpixman_headers)
- 
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
deleted file mode 100644
index 2a4e2e04cd4..00000000000
--- a/x11/pixman/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2012/05/12 17:38:32 wiz Exp $
-
---- pixman/Makefile.in.orig	2012-02-09 00:03:39.000000000 +0000
-+++ pixman/Makefile.in
-@@ -429,7 +429,7 @@ BUILT_SOURCES = \
- lib_LTLIBRARIES = libpixman-1.la
- libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
- 	-no-undefined @PTHREAD_LDFLAGS@ $(am__append_2) \
--	$(am__append_7) $(am__append_14)
-+	$(am__append_7) $(am__append_14) -export-symbols $(PIXMAN_SYMFILE)
- libpixman_1_la_LIBADD = @PTHREAD_LIBS@ @DEP_LIBS@ -lm $(am__append_3) \
- 	$(am__append_5) $(am__append_8) $(am__append_10) \
- 	$(am__append_12) $(am__append_15)
diff --git a/x11/pixman/patches/patch-ad b/x11/pixman/patches/patch-ad
deleted file mode 100644
index 7e9ef31f708..00000000000
--- a/x11/pixman/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2011/01/26 19:25:55 drochner Exp $
-
---- configure.ac.orig	2011-01-19 13:22:31.000000000 +0000
-+++ configure.ac
-@@ -246,15 +246,15 @@ AC_SUBST(OPENMP_CFLAGS)
- dnl =========================================================================
- dnl -fvisibility stuff
- 
--PIXMAN_CHECK_CFLAG([-fvisibility=hidden], [dnl
--#if defined(__GNUC__) && (__GNUC__ >= 4)
--#ifdef _WIN32
--#error Have -fvisibility but it is ignored and generates a warning
--#endif
--#else
--error Need GCC 4.0 for visibility
--#endif
--])
-+dnl PIXMAN_CHECK_CFLAG([-fvisibility=hidden], [dnl
-+dnl #if defined(__GNUC__) && (__GNUC__ >= 4)
-+dnl #ifdef _WIN32
-+dnl #error Have -fvisibility but it is ignored and generates a warning
-+dnl #endif
-+dnl #else
-+dnl error Need GCC 4.0 for visibility
-+dnl #endif
-+dnl ])
- 
- PIXMAN_CHECK_CFLAG([-xldscope=hidden], [dnl
- #if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
diff --git a/x11/pixman/patches/patch-af b/x11/pixman/patches/patch-af
index fdd38c7ec3f..011d7dde023 100644
--- a/x11/pixman/patches/patch-af
+++ b/x11/pixman/patches/patch-af
@@ -1,17 +1,8 @@
-$NetBSD: patch-af,v 1.10 2011/12/31 15:37:55 bsiegert Exp $
+$NetBSD: patch-af,v 1.11 2012/07/14 20:49:30 wiz Exp $
 
---- pixman/pixman-compiler.h.orig	Mon Jul  4 20:22:16 2011
+--- pixman/pixman-compiler.h.orig	2012-06-29 18:25:17.000000000 +0000
 +++ pixman/pixman-compiler.h
-@@ -82,7 +82,7 @@
- #   define PIXMAN_GET_THREAD_LOCAL(name)				\
-     (&name)
- 
--#elif defined(TOOLCHAIN_SUPPORTS__THREAD)
-+#elif defined(TOOLCHAIN_SUPPORTS__THREAD) && !defined(__NetBSD__)
- 
- #   define PIXMAN_DEFINE_THREAD_LOCAL(type, name)			\
-     static __thread type name
-@@ -149,7 +149,7 @@
+@@ -164,7 +164,7 @@
  #   define PIXMAN_GET_THREAD_LOCAL(name)				\
      (&name)