Module Name: src Committed By: mrg Date: Sat May 22 23:19:45 UTC 2010
Modified Files: src/distrib/sets/lists/xbase: mi shl.elf src/distrib/sets/lists/xcomp: md.amd64 md.i386 mi shl.mi src/etc/mtree: NetBSD.dist.Xorg Log Message: intall libkms.h into the right place. fix some libdrm_radeon issues. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xbase/shl.elf cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xcomp/md.i386 cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.6 -r1.7 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.90 src/distrib/sets/lists/xbase/mi:1.91 --- src/distrib/sets/lists/xbase/mi:1.90 Sat May 22 23:03:13 2010 +++ src/distrib/sets/lists/xbase/mi Sat May 22 23:19:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.90 2010/05/22 23:03:13 mrg Exp $ +# $NetBSD: mi,v 1.91 2010/05/22 23:19:44 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1506,6 +1506,7 @@ ./usr/X11R7/include/X11/pixmaps/xorg.xpm -unknown- xorg ./usr/X11R7/include/drm base-x11-root obsolete ./usr/X11R7/include/libdrm base-x11-root xorg +./usr/X11R7/include/libkms 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.28 src/distrib/sets/lists/xbase/shl.elf:1.29 --- src/distrib/sets/lists/xbase/shl.elf:1.28 Sat May 22 23:03:13 2010 +++ src/distrib/sets/lists/xbase/shl.elf Sat May 22 23:19:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.28 2010/05/22 23:03:13 mrg Exp $ +# $NetBSD: shl.elf,v 1.29 2010/05/22 23:19:44 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 @@ -198,7 +198,7 @@ ./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/libdrm_radeon.so.0 -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/xcomp/md.amd64 diff -u src/distrib/sets/lists/xcomp/md.amd64:1.22 src/distrib/sets/lists/xcomp/md.amd64:1.23 --- src/distrib/sets/lists/xcomp/md.amd64:1.22 Sat May 22 21:12:29 2010 +++ src/distrib/sets/lists/xcomp/md.amd64 Sat May 22 23:19:45 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.22 2010/05/22 21:12:29 mrg Exp $ +# $NetBSD: md.amd64,v 1.23 2010/05/22 23:19:45 mrg Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -70,7 +70,7 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 -unknown- .man,x11 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 -unknown- .man,x11 ./usr/X11R6/man/man4/fpit.4 -unknown- .man,x11 -./usr/X11R7/include/intel_bufmgr.h -unknown- xorg +./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete ./usr/X11R7/lib/libdrm_intel.a -unknown- xorg ./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg Index: src/distrib/sets/lists/xcomp/md.i386 diff -u src/distrib/sets/lists/xcomp/md.i386:1.28 src/distrib/sets/lists/xcomp/md.i386:1.29 --- src/distrib/sets/lists/xcomp/md.i386:1.28 Sat May 22 21:12:29 2010 +++ src/distrib/sets/lists/xcomp/md.i386 Sat May 22 23:19:45 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.28 2010/05/22 21:12:29 mrg Exp $ +# $NetBSD: md.i386,v 1.29 2010/05/22 23:19:45 mrg Exp $ ./usr/X11R6/include/xf86Optrec.h -unknown- x11 ./usr/X11R6/include/xf86Parser.h -unknown- x11 ./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11 @@ -70,7 +70,7 @@ ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3 -unknown- .man,x11 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 -unknown- .man,x11 ./usr/X11R6/man/man4/fpit.4 -unknown- .man,x11 -./usr/X11R7/include/intel_bufmgr.h -unknown- xorg +./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete ./usr/X11R7/lib/libdrm_intel.a -unknown- xorg ./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.105 src/distrib/sets/lists/xcomp/mi:1.106 --- src/distrib/sets/lists/xcomp/mi:1.105 Sat May 22 23:03:13 2010 +++ src/distrib/sets/lists/xcomp/mi Sat May 22 23:19:45 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.105 2010/05/22 23:03:13 mrg Exp $ +# $NetBSD: mi,v 1.106 2010/05/22 23:19:45 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -6215,6 +6215,9 @@ ./usr/X11R7/lib/libdrm.a -unknown- xorg ./usr/X11R7/lib/libdrm_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libdrm_p.a -unknown- profile,xorg +./usr/X11R7/lib/libdrm_radeon.a -unknown- xorg +./usr/X11R7/lib/libdrm_radeon_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/libdrm_radeon_p.a -unknown- profile,xorg ./usr/X11R7/lib/libexpat.a -unknown- xorg ./usr/X11R7/lib/libexpat_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libexpat_p.a -unknown- profile,xorg Index: src/distrib/sets/lists/xcomp/shl.mi diff -u src/distrib/sets/lists/xcomp/shl.mi:1.21 src/distrib/sets/lists/xcomp/shl.mi:1.22 --- src/distrib/sets/lists/xcomp/shl.mi:1.21 Sat May 22 23:03:13 2010 +++ src/distrib/sets/lists/xcomp/shl.mi Sat May 22 23:19:45 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.21 2010/05/22 23:03:13 mrg Exp $ +# $NetBSD: shl.mi,v 1.22 2010/05/22 23:19:45 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -90,6 +90,7 @@ ./usr/X11R7/lib/libXxf86misc_pic.a -unknown- xorg ./usr/X11R7/lib/libXxf86vm_pic.a -unknown- xorg ./usr/X11R7/lib/libdrm_pic.a -unknown- xorg +./usr/X11R7/lib/libdrm_radeon_pic.a -unknown- xorg ./usr/X11R7/lib/libexpat_pic.a -unknown- xorg ./usr/X11R7/lib/libfontconfig_pic.a -unknown- xorg ./usr/X11R7/lib/libfontenc_pic.a -unknown- xorg Index: src/etc/mtree/NetBSD.dist.Xorg diff -u src/etc/mtree/NetBSD.dist.Xorg:1.6 src/etc/mtree/NetBSD.dist.Xorg:1.7 --- src/etc/mtree/NetBSD.dist.Xorg:1.6 Sat May 22 23:03:13 2010 +++ src/etc/mtree/NetBSD.dist.Xorg Sat May 22 23:19:45 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.Xorg,v 1.6 2010/05/22 23:03:13 mrg Exp $ +# $NetBSD: NetBSD.dist.Xorg,v 1.7 2010/05/22 23:19:45 mrg Exp $ ./usr/X11R7 ./usr/X11R7/bin @@ -21,6 +21,7 @@ ./usr/X11R7/include/X11/fonts ./usr/X11R7/include/X11/pixmaps ./usr/X11R7/include/libdrm +./usr/X11R7/include/libkms ./usr/X11R7/include/fontconfig ./usr/X11R7/include/freetype2 ./usr/X11R7/include/freetype2/freetype