Module Name: src
Committed By: mrg
Date: Sun May 23 04:26:19 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: shl.mi
src/external/mit/xorg/lib/pixman: Makefile shlib_version
Log Message:
bump libpixman-1.so minor. avoid double defining PIXMAN_DISABLE_DEPRECATED.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/pixman/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.36 src/distrib/sets/lists/xbase/shl.mi:1.37
--- src/distrib/sets/lists/xbase/shl.mi:1.36 Sat May 22 23:03:13 2010
+++ src/distrib/sets/lists/xbase/shl.mi Sun May 23 04:26:19 2010
@@ -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
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.22 src/distrib/sets/lists/xcomp/shl.mi:1.23
--- src/distrib/sets/lists/xcomp/shl.mi:1.22 Sat May 22 23:19:45 2010
+++ src/distrib/sets/lists/xcomp/shl.mi Sun May 23 04:26:19 2010
@@ -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
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.10 src/external/mit/xorg/lib/pixman/Makefile:1.11
--- src/external/mit/xorg/lib/pixman/Makefile:1.10 Mon Nov 9 01:11:59 2009
+++ src/external/mit/xorg/lib/pixman/Makefile Sun May 23 04:26:19 2010
@@ -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
Index: src/external/mit/xorg/lib/pixman/shlib_version
diff -u src/external/mit/xorg/lib/pixman/shlib_version:1.4 src/external/mit/xorg/lib/pixman/shlib_version:1.5
--- src/external/mit/xorg/lib/pixman/shlib_version:1.4 Thu Jun 11 05:11:14 2009
+++ src/external/mit/xorg/lib/pixman/shlib_version Sun May 23 04:26:19 2010
@@ -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
