Module Name: src
Committed By: mrg
Date: Sat May 22 23:03:13 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: mi shl.elf shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/etc/mtree: NetBSD.dist.Xorg
Log Message:
deal with libdrm 2.4.40: new / moved headers, libdrm_radeon.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xbase/shl.elf
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.5 -r1.6 src/etc/mtree/NetBSD.dist.Xorg
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/mi
diff -u src/distrib/sets/lists/xbase/mi:1.89 src/distrib/sets/lists/xbase/mi:1.90
--- src/distrib/sets/lists/xbase/mi:1.89 Fri May 21 06:09:34 2010
+++ src/distrib/sets/lists/xbase/mi Sat May 22 23:03:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.89 2010/05/21 06:09:34 mrg Exp $
+# $NetBSD: mi,v 1.90 2010/05/22 23:03:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1504,7 +1504,8 @@
./usr/X11R7/include/X11/pixmaps/NetBSD.xpm -unknown- xorg
./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm -unknown- xorg
./usr/X11R7/include/X11/pixmaps/xorg.xpm -unknown- xorg
-./usr/X11R7/include/drm base-x11-root xorg
+./usr/X11R7/include/drm base-x11-root obsolete
+./usr/X11R7/include/libdrm base-x11-root xorg
./usr/X11R7/include/fontconfig base-x11-root xorg
./usr/X11R7/include/freetype2 base-x11-root xorg
./usr/X11R7/include/freetype2/freetype base-x11-root xorg
Index: src/distrib/sets/lists/xbase/shl.elf
diff -u src/distrib/sets/lists/xbase/shl.elf:1.27 src/distrib/sets/lists/xbase/shl.elf:1.28
--- src/distrib/sets/lists/xbase/shl.elf:1.27 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xbase/shl.elf Sat May 22 23:03:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.27 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: shl.elf,v 1.28 2010/05/22 23:03:13 mrg Exp $
./usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 -unknown- x11
./usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -unknown- x11
./usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -unknown- x11
@@ -197,6 +197,8 @@
./usr/X11R7/lib/libXxf86vm.so.2 -unknown- xorg
./usr/X11R7/lib/libdrm.so -unknown- xorg
./usr/X11R7/lib/libdrm.so.3 -unknown- xorg
+./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg
+./usr/X11R7/lib/libdrm_radeon.so.3 -unknown- xorg
./usr/X11R7/lib/libexpat.so -unknown- xorg
./usr/X11R7/lib/libexpat.so.2 -unknown- xorg
./usr/X11R7/lib/libfontconfig.so -unknown- xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.35 src/distrib/sets/lists/xbase/shl.mi:1.36
--- src/distrib/sets/lists/xbase/shl.mi:1.35 Sat May 22 10:32:18 2010
+++ src/distrib/sets/lists/xbase/shl.mi Sat May 22 23:03:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.35 2010/05/22 10:32:18 mrg Exp $
+# $NetBSD: shl.mi,v 1.36 2010/05/22 23:03:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -98,7 +98,8 @@
./usr/X11R7/lib/libXxf86dga.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXxf86misc.so.2.0 -unknown- xorg
./usr/X11R7/lib/libXxf86vm.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libdrm.so.3.1 -unknown- xorg
+./usr/X11R7/lib/libdrm.so.3.2 -unknown- xorg
+./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg
./usr/X11R7/lib/libexpat.so.2.0 -unknown- xorg
./usr/X11R7/lib/libfontconfig.so.2.0 -unknown- xorg
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.104 src/distrib/sets/lists/xcomp/mi:1.105
--- src/distrib/sets/lists/xcomp/mi:1.104 Sat May 22 11:20:18 2010
+++ src/distrib/sets/lists/xcomp/mi Sat May 22 23:03:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.104 2010/05/22 11:20:18 mrg Exp $
+# $NetBSD: mi,v 1.105 2010/05/22 23:03:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5491,21 +5491,41 @@
./usr/X11R7/include/X11/drm/via_3d_reg.h -unknown- obsolete
./usr/X11R7/include/X11/drm/via_drm.h -unknown- obsolete
./usr/X11R7/include/X11/drm/xgi_drm.h -unknown- obsolete
-./usr/X11R7/include/drm/drm.h -unknown- xorg
-./usr/X11R7/include/drm/drm_mode.h -unknown- xorg
-./usr/X11R7/include/drm/drm_sarea.h -unknown- xorg
-./usr/X11R7/include/drm/i915_drm.h -unknown- xorg
-./usr/X11R7/include/drm/mach64_drm.h -unknown- xorg
-./usr/X11R7/include/drm/mga_drm.h -unknown- xorg
-./usr/X11R7/include/drm/nouveau_drm.h -unknown- xorg
-./usr/X11R7/include/drm/r128_drm.h -unknown- xorg
-./usr/X11R7/include/drm/r300_reg.h -unknown- xorg
-./usr/X11R7/include/drm/radeon_drm.h -unknown- xorg
-./usr/X11R7/include/drm/savage_drm.h -unknown- xorg
-./usr/X11R7/include/drm/sis_drm.h -unknown- xorg
-./usr/X11R7/include/drm/via_3d_reg.h -unknown- xorg
-./usr/X11R7/include/drm/via_drm.h -unknown- xorg
-./usr/X11R7/include/drm/xgi_drm.h -unknown- xorg
+./usr/X11R7/include/drm/drm.h -unknown- obsolete
+./usr/X11R7/include/drm/drm_mode.h -unknown- obsolete
+./usr/X11R7/include/drm/drm_sarea.h -unknown- obsolete
+./usr/X11R7/include/drm/i915_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/mach64_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/mga_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/nouveau_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/r128_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/r300_reg.h -unknown- obsolete
+./usr/X11R7/include/drm/radeon_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/savage_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/sis_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/via_3d_reg.h -unknown- obsolete
+./usr/X11R7/include/drm/via_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/xgi_drm.h -unknown- obsolete
+./usr/X11R7/include/libdrm/drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg
+./usr/X11R7/include/libdrm/drm_sarea.h -unknown- xorg
+./usr/X11R7/include/libdrm/i915_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/intel_bufmgr.h -unknown- xorg
+./usr/X11R7/include/libdrm/mach64_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/mga_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/nouveau_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/r128_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_bo.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_bo_gem.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_bo_int.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_cs.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_cs_gem.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_cs_int.h -unknown- xorg
+./usr/X11R7/include/libdrm/radeon_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/savage_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/sis_drm.h -unknown- xorg
+./usr/X11R7/include/libdrm/via_drm.h -unknown- xorg
+./usr/X11R7/include/libkms/libkms.h -unknown- xorg
./usr/X11R7/include/X11/dri/xf86driproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/EVI.h -unknown- xorg
./usr/X11R7/include/X11/extensions/EVIproto.h -unknown- xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.20 src/distrib/sets/lists/xcomp/shl.mi:1.21
--- src/distrib/sets/lists/xcomp/shl.mi:1.20 Sat May 22 10:32:18 2010
+++ src/distrib/sets/lists/xcomp/shl.mi Sat May 22 23:03:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.20 2010/05/22 10:32:18 mrg Exp $
+# $NetBSD: shl.mi,v 1.21 2010/05/22 23:03:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -194,7 +194,8 @@
./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.5 src/etc/mtree/NetBSD.dist.Xorg:1.6
--- src/etc/mtree/NetBSD.dist.Xorg:1.5 Tue Apr 27 05:34:15 2010
+++ src/etc/mtree/NetBSD.dist.Xorg Sat May 22 23:03:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.5 2010/04/27 05:34:15 lukem Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.6 2010/05/22 23:03:13 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
@@ -20,7 +20,7 @@
./usr/X11R7/include/X11/extensions
./usr/X11R7/include/X11/fonts
./usr/X11R7/include/X11/pixmaps
-./usr/X11R7/include/drm
+./usr/X11R7/include/libdrm
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
./usr/X11R7/include/freetype2/freetype
