Thu Apr 23 08:30:53 2009 UTC ()
Update to pixman-0.15.2 from 0.12.0

Upstream changes (since 0.12.0):
  - Fix MMX & SSE intrinsics to work with Sun compilers & Solaris
  - More SSE2 optimizations
  - Optimize rectilinear nearest-neighbour scaling
  - Add support for BGRA and BGRx formats
  and a lot of minor bug fixes and optimizations

Oked by wiz@


(sno)
diff -r1.21 -r1.22 pkgsrc/x11/pixman/Makefile
diff -r1.21 -r1.22 pkgsrc/x11/pixman/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/pixman/hacks.mk
diff -r1.8 -r1.9 pkgsrc/x11/pixman/patches/patch-ab
diff -r1.7 -r1.8 pkgsrc/x11/pixman/patches/patch-ae
diff -r1.1 -r0 pkgsrc/x11/pixman/patches/patch-ah
diff -r1.1 -r0 pkgsrc/x11/pixman/patches/patch-ai
cvs diff -r1.21 -r1.22 pkgsrc/x11/pixman/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/pixman/Makefile 2008/10/15 00:56:45 1.21
+++ pkgsrc/x11/pixman/Makefile 2009/04/23 08:30:53 1.22
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.21 2008/10/15 00:56:45 bjs Exp $ 1# $NetBSD: Makefile,v 1.22 2009/04/23 08:30:53 sno Exp $
2# 2#
3 3
4DISTNAME= pixman-0.12.0 4DISTNAME= pixman-0.15.2
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= bjs@NetBSD.org 9MAINTAINER= bjs@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Library of low-level pixel manipulation routines 11COMMENT= Library of low-level pixel manipulation routines
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config perl 17USE_TOOLS+= pkg-config perl
cvs diff -r1.21 -r1.22 pkgsrc/x11/pixman/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/pixman/distinfo 2008/10/15 00:56:45 1.21
+++ pkgsrc/x11/pixman/distinfo 2009/04/23 08:30:53 1.22
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
1$NetBSD: distinfo,v 1.21 2008/10/15 00:56:45 bjs Exp $ 1$NetBSD: distinfo,v 1.22 2009/04/23 08:30:53 sno Exp $
2 2
3SHA1 (pixman-0.12.0.tar.bz2) = 0c57c6c7e21e2545257068f52517c460e6e51ae4 3SHA1 (pixman-0.15.2.tar.bz2) = fd44f4dc0e429bb71344d33c783837fd0b8b6b5b
4RMD160 (pixman-0.12.0.tar.bz2) = 7881189a1de21ec5d2e27936c65369f121dcb15f 4RMD160 (pixman-0.15.2.tar.bz2) = 5d925326dfdc3ad73d98eb48f92eccab0f97f63c
5Size (pixman-0.12.0.tar.bz2) = 364262 bytes 5Size (pixman-0.15.2.tar.bz2) = 343019 bytes
6SHA1 (patch-aa) = 5129f82ee9907ed179315a4790667f0b825175bb 6SHA1 (patch-aa) = 5129f82ee9907ed179315a4790667f0b825175bb
7SHA1 (patch-ab) = e76a306cbf2975dec3020cd7a310941b3085782d 7SHA1 (patch-ab) = 11fe86650fe666366818dd70ecabeac7a49c1dba
8SHA1 (patch-ac) = c798e52ecd8fc2a5788552df0a0842f524705126 8SHA1 (patch-ac) = c798e52ecd8fc2a5788552df0a0842f524705126
9SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451 9SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451
10SHA1 (patch-ae) = 5690db2799e3750d54cf1cb20bd5734a245f8eb8 10SHA1 (patch-ae) = 43ac5ba418bb335ef65634bc6dea5d7dc89a19d0
11SHA1 (patch-ah) = 88a444f4ed0bc12387c22751b4cd4ef7cf5a5126 
12SHA1 (patch-ai) = 5af5d1287b73ae35d6bc5a6adb5ae4709bf57e67 
cvs diff -r1.2 -r1.3 pkgsrc/x11/pixman/hacks.mk (expand / switch to unified diff)

--- pkgsrc/x11/pixman/hacks.mk 2008/09/06 20:09:15 1.2
+++ pkgsrc/x11/pixman/hacks.mk 2009/04/23 08:30:53 1.3
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: hacks.mk,v 1.2 2008/09/06 20:09:15 bjs Exp $ 1# $NetBSD: hacks.mk,v 1.3 2009/04/23 08:30:53 sno Exp $
2# 2#
3.if !defined(PIXMAN_HACKS_MK) 3.if !defined(PIXMAN_HACKS_MK)
4PIXMAN_HACKS_MK= # empty 4PIXMAN_HACKS_MK= # empty
5. include "../../mk/bsd.fast.prefs.mk" 5. include "../../mk/bsd.fast.prefs.mk"
6. include "../../mk/compiler.mk" 6. include "../../mk/compiler.mk"
7### 7###
8### XXX SSE2 intrinsics require gcc-4.2+ to build unless 8### XXX SSE2 intrinsics require gcc-4.2+ to build unless
9### ${MACHINE_ARCH} == "x86_64". 9### ${MACHINE_ARCH} == "x86_64".
10### 10###
11. if !empty(PKGSRC_COMPILER:Msunpro) || \ 11. if empty(PKGSRC_COMPILER:Msunpro) && \
12 (empty(MACHINE_ARCH:Mx86_64) && empty(CC_VERSION:Mgcc-[4-9].[2-9]*)) 12 (empty(MACHINE_ARCH:Mx86_64) && \
 13 (empty(CC_VERSION:Mgcc-4.[2-9]*) || empty(CC_VERSION:Mgcc-[5-9].*) || empty(CC_VERSION:Mgcc-[1-9][0-9]*)))
13CONFIGURE_ARGS+= --disable-sse2 14CONFIGURE_ARGS+= --disable-sse2
14. endif 15. endif
15.endif 16.endif
cvs diff -r1.8 -r1.9 pkgsrc/x11/pixman/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/pixman/patches/Attic/patch-ab 2008/09/06 20:09:16 1.8
+++ pkgsrc/x11/pixman/patches/Attic/patch-ab 2009/04/23 08:30:53 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.8 2008/09/06 20:09:16 bjs Exp $ 1$NetBSD: patch-ab,v 1.9 2009/04/23 08:30:53 sno Exp $
2 2
3--- pixman/Makefile.in.orig 2008-09-06 06:07:43.000000000 -0400 3--- pixman/Makefile.in.orig 2009-04-09 20:23:27.000000000 +0000
4+++ pixman/Makefile.in 4+++ pixman/Makefile.in 2009-04-12 08:55:34.000000000 +0000
5@@ -263,7 +263,8 @@ target_alias = @target_alias@ 5@@ -288,7 +288,8 @@
6 top_builddir = @top_builddir@ 
7 top_srcdir = @top_srcdir@ 6 top_srcdir = @top_srcdir@
8 lib_LTLIBRARIES = libpixman-1.la 7 lib_LTLIBRARIES = libpixman-1.la
9-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined 8 libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
10+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined \ 9- -no-undefined $(am__append_2) $(am__append_7)
 10+ -no-undefined $(am__append_2) $(am__append_7) \
11+ -export-symbols $(PIXMAN_SYMFILE) 11+ -export-symbols $(PIXMAN_SYMFILE)
12 libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_2) $(am__append_4) \ 12 libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_3) $(am__append_5) \
13 $(am__append_6) 13 $(am__append_8) $(am__append_10)
14 libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED 14 libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED
cvs diff -r1.7 -r1.8 pkgsrc/x11/pixman/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/pixman/patches/Attic/patch-ae 2008/09/06 20:09:16 1.7
+++ pkgsrc/x11/pixman/patches/Attic/patch-ae 2009/04/23 08:30:53 1.8
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-ae,v 1.7 2008/09/06 20:09:16 bjs Exp $ 1$NetBSD: patch-ae,v 1.8 2009/04/23 08:30:53 sno Exp $
2 2
3--- configure.orig 2008-09-06 06:07:45.000000000 -0400 3--- configure.orig 2009-02-06 22:33:17.000000000 +0000
4+++ configure 4+++ configure 2009-04-12 08:19:38.000000000 +0000
5@@ -20218,6 +20218,7 @@ fi 5@@ -20588,6 +20588,7 @@
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 { $as_echo "$as_me:$LINENO: checking for -fvisibility" >&5
11 echo $ECHO_N "checking for -fvisibility... $ECHO_C" >&6; } 11 $as_echo_n "checking for -fvisibility... " >&6; }
12 cat >conftest.$ac_ext <<_ACEOF 12 cat >conftest.$ac_ext <<_ACEOF
13@@ -20255,7 +20256,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 13@@ -20626,7 +20627,7 @@
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
File Deleted: pkgsrc/x11/pixman/patches/Attic/patch-ah
File Deleted: pkgsrc/x11/pixman/patches/Attic/patch-ai