[src/trunk]: src bump libpixman-1.so minor. avoid double defining PIXMAN_DIS...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71282974f46b
branches:  trunk
changeset: 755121:71282974f46b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun May 23 04:26:19 2010 +0000

description:
bump libpixman-1.so minor.  avoid double defining PIXMAN_DISABLE_DEPRECATED.

diffstat:

 distrib/sets/lists/xbase/shl.mi            |  4 ++--
 distrib/sets/lists/xcomp/shl.mi            |  4 ++--
 external/mit/xorg/lib/pixman/Makefile      |  4 ++--
 external/mit/xorg/lib/pixman/shlib_version |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (63 lines):

diff -r 3700830b40ac -r 71282974f46b distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Sun May 23 02:25:50 2010 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Sun May 23 04:26:19 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.36 2010/05/22 23:03:13 mrg Exp $
+# $NetBSD: shl.mi,v 1.37 2010/05/23 04:26:19 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -107,6 +107,6 @@
 ./usr/X11R7/lib/libglut.so.4.0                 -unknown-               xorg
 ./usr/X11R7/lib/liblbxutil.so.2.0              -obsolete-              obsolete
 ./usr/X11R7/lib/libpciaccess.so.0.2            -unknown-               xorg
-./usr/X11R7/lib/libpixman-1.so.2.0             -unknown-               xorg
+./usr/X11R7/lib/libpixman-1.so.2.1             -unknown-               xorg
 ./usr/X11R7/lib/libxkbfile.so.2.0              -unknown-               xorg
 ./usr/X11R7/lib/libxkbui.so.2.0                        -unknown-               xorg
diff -r 3700830b40ac -r 71282974f46b distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi   Sun May 23 02:25:50 2010 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi   Sun May 23 04:26:19 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shl.mi,v 1.22 2010/05/22 23:19:45 mrg Exp $
+#      $NetBSD: shl.mi,v 1.23 2010/05/23 04:26:19 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -203,7 +203,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.1.debug     -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.2.debug    -unknown-               xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.0.debug     -unknown-               xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.1.debug     -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug      -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug        -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug   -unknown-       xorg,debug
diff -r 3700830b40ac -r 71282974f46b external/mit/xorg/lib/pixman/Makefile
--- a/external/mit/xorg/lib/pixman/Makefile     Sun May 23 02:25:50 2010 +0000
+++ b/external/mit/xorg/lib/pixman/Makefile     Sun May 23 04:26:19 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2009/11/09 01:11:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2010/05/23 04:26:19 mrg Exp $
 
 NOLINT=        1       # defined
 
@@ -57,7 +57,7 @@
 INCS=  pixman.h pixman-version.h
 INCSDIR=${X11INCDIR}/pixman-1
 
-CPPFLAGS+=     -DPIXMAN_DISABLE_DEPRECATED -DHAVE_CONFIG_H \
+CPPFLAGS+=     -DHAVE_CONFIG_H \
                -I${X11SRCDIR.pixman}/../include \
                -I${X11SRCDIR.pixman}/../combine \
                -I${X11SRCDIR.pixman}/pixman
diff -r 3700830b40ac -r 71282974f46b external/mit/xorg/lib/pixman/shlib_version
--- a/external/mit/xorg/lib/pixman/shlib_version        Sun May 23 02:25:50 2010 +0000
+++ b/external/mit/xorg/lib/pixman/shlib_version        Sun May 23 04:26:19 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.4 2009/06/11 05:11:14 mrg Exp $
+#      $NetBSD: shlib_version,v 1.5 2010/05/23 04:26:19 mrg Exp $
 #
 major=2
-minor=0
+minor=1