Module Name: src
Committed By: msaitoh
Date: Mon Dec 12 09:32:35 UTC 2016
Modified Files:
src/distrib/sets/lists/xbase [netbsd-7]: md.amd64 md.i386
src/distrib/sets/lists/xcomp [netbsd-7]: md.amd64 md.i386 mi
src/distrib/sets/lists/xdebug [netbsd-7]: md.amd64 md.i386
src/distrib/sets/lists/xserver [netbsd-7]: md.amd64 md.i386
src/external/mit/xorg/lib [netbsd-7]: Makefile
src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile
src/external/mit/xorg/lib/libdrm/drm [netbsd-7]: Makefile
src/external/mit/xorg/server/drivers [netbsd-7]: Makefile
src/share/mk [netbsd-7]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by snj in ticket #1305):
distrib/sets/lists/xbase/md.amd64: revision 1.15 via patch
distrib/sets/lists/xbase/md.i386: revision 1.29
distrib/sets/lists/xcomp/md.amd64: revision 1.43 via patch
distrib/sets/lists/xcomp/md.i386: revision 1.48 via patch
distrib/sets/lists/xcomp/mi: revision 1.175
distrib/sets/lists/xdebug/md.amd64: revision 1.22 via patch
distrib/sets/lists/xdebug/md.i386: revision 1.21 via patch
distrib/sets/lists/xserver/md.amd64: revisions 1.85-1.87
distrib/sets/lists/xserver/md.i386: revision 1.103-1.105
external/mit/xorg/lib/Makefile: revision 1.36
external/mit/xorg/lib/gallium/Makefile: revision 1.8, 1.9
external/mit/xorg/lib/libdrm/drm/Makefile: revision 1.7
external/mit/xorg/lib/libdrm_nouveau/Makefile: revision 1.1
external/mit/xorg/lib/libdrm_nouveau/shlib_version: revision 1.1
external/mit/xorg/server/drivers/Makefile: revision 1.70
external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile: revisions
1.1, 1.2 via patch
share/mk/bsd.own.mk: revision 1.875 via patch
Build xf86-video-nouveau and libdrm_nouveau on x86.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.4.1 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.27 -r1.27.4.1 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.38 -r1.38.2.1 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.45 -r1.45.2.1 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.152.2.6 -r1.152.2.7 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.6.4.3 -r1.6.4.4 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.6.4.4 -r1.6.4.5 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.73.4.3 -r1.73.4.4 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.92.4.3 -r1.92.4.4 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/mit/xorg/lib/libdrm/drm/Makefile
cvs rdiff -u -r1.63.10.2 -r1.63.10.3 \
src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.829.2.9 -r1.829.2.10 src/share/mk/bsd.own.mk
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/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.11 src/distrib/sets/lists/xbase/md.amd64:1.11.4.1
--- src/distrib/sets/lists/xbase/md.amd64:1.11 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/md.amd64 Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.11 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.amd64,v 1.11.4.1 2016/12/12 09:32:34 msaitoh Exp $
./usr/X11R7/lib/libI810XvMC.so -unknown- xorg
./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg
./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg
@@ -14,4 +14,7 @@
./usr/X11R7/lib/libdrm_intel.so -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2 -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2.0 -unknown- xorg
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
Index: src/distrib/sets/lists/xbase/md.i386
diff -u src/distrib/sets/lists/xbase/md.i386:1.27 src/distrib/sets/lists/xbase/md.i386:1.27.4.1
--- src/distrib/sets/lists/xbase/md.i386:1.27 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/md.i386 Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.27 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: md.i386,v 1.27.4.1 2016/12/12 09:32:34 msaitoh Exp $
./usr/X11R7/lib/libI810XvMC.so -unknown- xorg
./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg
./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg
@@ -14,4 +14,7 @@
./usr/X11R7/lib/libdrm_intel.so -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg
./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2 -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2.0 -unknown- xorg
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.38 src/distrib/sets/lists/xcomp/md.amd64:1.38.2.1
--- src/distrib/sets/lists/xcomp/md.amd64:1.38 Thu May 15 16:32:28 2014
+++ src/distrib/sets/lists/xcomp/md.amd64 Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.38 2014/05/15 16:32:28 apb Exp $
+# $NetBSD: md.amd64,v 1.38.2.1 2016/12/12 09:32:34 msaitoh Exp $
#./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
@@ -87,8 +87,13 @@
./usr/X11R7/lib/libdrm_intel.a -unknown- xorg
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libdrm_nouveau.a -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libdrm_nouveau_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg
./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lchromeXvMCPro.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.45 src/distrib/sets/lists/xcomp/md.i386:1.45.2.1
--- src/distrib/sets/lists/xcomp/md.i386:1.45 Thu May 15 16:32:28 2014
+++ src/distrib/sets/lists/xcomp/md.i386 Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.45 2014/05/15 16:32:28 apb Exp $
+# $NetBSD: md.i386,v 1.45.2.1 2016/12/12 09:32:34 msaitoh Exp $
#./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
@@ -87,8 +87,13 @@
./usr/X11R7/lib/libdrm_intel.a -unknown- xorg
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libdrm_nouveau.a -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libdrm_nouveau_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg
./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lchromeXvMC.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lchromeXvMCPro.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.152.2.6 src/distrib/sets/lists/xcomp/mi:1.152.2.7
--- src/distrib/sets/lists/xcomp/mi:1.152.2.6 Fri Apr 10 20:40:19 2015
+++ src/distrib/sets/lists/xcomp/mi Mon Dec 12 09:32:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152.2.6 2015/04/10 20:40:19 snj Exp $
+# $NetBSD: mi,v 1.152.2.7 2016/12/12 09:32:34 msaitoh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5800,6 +5800,7 @@
./usr/X11R7/include/libdrm/intel_debug.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.h -unknown- xorg
./usr/X11R7/include/libdrm/nouveau_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/qxl_drm.h -unknown- xorg
./usr/X11R7/include/libdrm/r128_drm.h -unknown- xorg
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.6.4.3 src/distrib/sets/lists/xdebug/md.amd64:1.6.4.4
--- src/distrib/sets/lists/xdebug/md.amd64:1.6.4.3 Mon Mar 9 08:45:26 2015
+++ src/distrib/sets/lists/xdebug/md.amd64 Mon Dec 12 09:32:35 2016
@@ -1,9 +1,10 @@
-# $NetBSD: md.amd64,v 1.6.4.3 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: md.amd64,v 1.6.4.4 2016/12/12 09:32:35 msaitoh Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libdrm_nouveau_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- xorg,debuglib
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- xorg,debuglib
@@ -46,6 +47,7 @@
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i965_dri.so.0.debug -unknown- xorg,debug
@@ -144,6 +146,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.6.4.4 src/distrib/sets/lists/xdebug/md.i386:1.6.4.5
--- src/distrib/sets/lists/xdebug/md.i386:1.6.4.4 Mon Mar 9 08:45:26 2015
+++ src/distrib/sets/lists/xdebug/md.i386 Mon Dec 12 09:32:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.6.4.4 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: md.i386,v 1.6.4.5 2016/12/12 09:32:35 msaitoh Exp $
./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11
./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11
@@ -40,6 +40,7 @@
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libdrm_nouveau_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libGLcore_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete
@@ -92,6 +93,7 @@
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i965_dri.so.0.debug -unknown- xorg,debug
@@ -193,6 +195,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.73.4.3 src/distrib/sets/lists/xserver/md.amd64:1.73.4.4
--- src/distrib/sets/lists/xserver/md.amd64:1.73.4.3 Mon Mar 9 08:45:26 2015
+++ src/distrib/sets/lists/xserver/md.amd64 Mon Dec 12 09:32:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.73.4.3 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: md.amd64,v 1.73.4.4 2016/12/12 09:32:35 msaitoh Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -367,6 +367,8 @@
./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/nouveau_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/nouveau_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
@@ -437,6 +439,8 @@
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nouveau_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nouveau_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/nv_drv.so -unknown- xorg
@@ -625,6 +629,7 @@
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/openchrome.0 -unknown- .cat,xorg
@@ -670,6 +675,7 @@
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
+./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
./usr/X11R7/man/html4/openchrome.html -unknown- html,xorg
@@ -715,6 +721,7 @@
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nsc.4 -unknown- obsolete
./usr/X11R7/man/man4/nv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/openchrome.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.92.4.3 src/distrib/sets/lists/xserver/md.i386:1.92.4.4
--- src/distrib/sets/lists/xserver/md.i386:1.92.4.3 Mon Mar 9 08:45:26 2015
+++ src/distrib/sets/lists/xserver/md.i386 Mon Dec 12 09:32:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.92.4.3 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: md.i386,v 1.92.4.4 2016/12/12 09:32:35 msaitoh Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -401,6 +401,8 @@
./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/nouveau_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/nouveau_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r200_dri.so -unknown- xorg
@@ -477,6 +479,8 @@
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nouveau_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nouveau_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/nv_drv.so -unknown- xorg
@@ -666,6 +670,7 @@
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/openchrome.0 -unknown- .cat,xorg
@@ -712,6 +717,7 @@
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
+./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
./usr/X11R7/man/html4/openchrome.html -unknown- html,xorg
@@ -758,6 +764,7 @@
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nsc.4 -unknown- obsolete
./usr/X11R7/man/man4/nv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/openchrome.4 -unknown- .man,xorg
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.29.2.2 src/external/mit/xorg/lib/Makefile:1.29.2.3
--- src/external/mit/xorg/lib/Makefile:1.29.2.2 Tue Mar 3 08:28:12 2015
+++ src/external/mit/xorg/lib/Makefile Mon Dec 12 09:32:35 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29.2.2 2015/03/03 08:28:12 snj Exp $
+# $NetBSD: Makefile,v 1.29.2.3 2016/12/12 09:32:35 msaitoh Exp $
# build libraries for xorg
SUBDIR= libfontenc freetype libFS libICE libglapi \
libXau libXdmcp libdrm libpciaccess libpthread-stubs .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=libdrm_intel
+SUBDIR+=libdrm_intel libdrm_nouveau
.endif
SUBDIR+=libdrm_radeon pixman xkeyboard-config libxcb \
.WAIT
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.6.2.3 src/external/mit/xorg/lib/gallium/Makefile:1.6.2.4
--- src/external/mit/xorg/lib/gallium/Makefile:1.6.2.3 Tue Jan 6 11:00:40 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Mon Dec 12 09:32:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6.2.3 2015/01/06 11:00:40 martin Exp $
+# $NetBSD: Makefile,v 1.6.2.4 2016/12/12 09:32:35 msaitoh Exp $
# Link the gallium mega driver.
@@ -15,7 +15,7 @@ DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/
DRIVERS= kms_swrast swrast
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DRIVERS+= r600
+DRIVERS+= r600 nouveau
.endif
CPPFLAGS+= \
@@ -47,8 +47,14 @@ GALLIUM_SUBDIRS= \
drivers/radeon \
drivers/r600 \
drivers/r600/sb \
+ drivers/nouveau \
+ drivers/nouveau/nv30 \
+ drivers/nouveau/nv50 \
+ drivers/nouveau/codegen \
+ drivers/nouveau/nvc0 \
drivers/softpipe \
winsys/radeon/drm \
+ winsys/nouveau/drm \
winsys/sw/null \
winsys/sw/dri \
winsys/sw/kms-dri \
@@ -340,6 +346,116 @@ GALLIUM_SOURCES.drivers/r600/sb = \
CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/drivers/r600
.endfor
+GALLIUM_SOURCES.drivers/nouveau = \
+ nouveau_screen.c \
+ nouveau_fence.c \
+ nouveau_mm.c \
+ nouveau_buffer.c \
+ nouveau_heap.c \
+ nouveau_video.c \
+ nouveau_vp3_video.c \
+ nouveau_vp3_video_bsp.c \
+ nouveau_vp3_video_vp.c
+
+GALLIUM_SOURCES.drivers/nouveau/nv30 = \
+ nv30_screen.c \
+ nv30_context.c \
+ nv30_format.c \
+ nv30_resource.c \
+ nv30_transfer.c \
+ nv30_miptree.c \
+ nv30_state.c \
+ nv30_state_validate.c \
+ nv30_texture.c \
+ nv30_fragtex.c \
+ nv40_verttex.c \
+ nv30_fragprog.c \
+ nv30_vertprog.c \
+ nv30_clear.c \
+ nv30_vbo.c \
+ nv30_push.c \
+ nv30_draw.c \
+ nv30_query.c \
+ nvfx_vertprog.c \
+ nvfx_fragprog.c
+
+GALLIUM_SOURCES.drivers/nouveau/nv50 = \
+ nv50_context.c \
+ nv50_formats.c \
+ nv50_miptree.c \
+ nv50_resource.c \
+ nv50_screen.c \
+ nv50_state.c \
+ nv50_state_validate.c \
+ nv50_surface.c \
+ nv50_tex.c \
+ nv50_transfer.c \
+ nv50_vbo.c \
+ nv50_program.c \
+ nv50_shader_state.c \
+ nv50_push.c \
+ nv50_query.c \
+ nv84_video.c \
+ nv84_video_bsp.c \
+ nv84_video_vp.c \
+ nv98_video.c \
+ nv98_video_bsp.c \
+ nv98_video_vp.c \
+ nv98_video_ppp.c
+
+GALLIUM_SOURCES.drivers/nouveau/codegen = \
+ nv50_ir.cpp \
+ nv50_ir_bb.cpp \
+ nv50_ir_build_util.cpp \
+ nv50_ir_emit_nv50.cpp \
+ nv50_ir_from_tgsi.cpp \
+ nv50_ir_graph.cpp \
+ nv50_ir_lowering_nv50.cpp \
+ nv50_ir_peephole.cpp \
+ nv50_ir_print.cpp \
+ nv50_ir_ra.cpp \
+ nv50_ir_ssa.cpp \
+ nv50_ir_target.cpp \
+ nv50_ir_target_nv50.cpp \
+ nv50_ir_util.cpp \
+ nv50_ir_emit_nvc0.cpp \
+ nv50_ir_emit_gk110.cpp \
+ nv50_ir_emit_gm107.cpp \
+ nv50_ir_lowering_nvc0.cpp \
+ nv50_ir_lowering_gm107.cpp \
+ nv50_ir_target_nvc0.cpp \
+ nv50_ir_target_gm107.cpp
+
+GALLIUM_SOURCES.drivers/nouveau/nvc0 = \
+ nvc0_compute.c \
+ nvc0_context.c \
+ nvc0_formats.c \
+ nvc0_miptree.c \
+ nvc0_resource.c \
+ nvc0_screen.c \
+ nvc0_state.c \
+ nvc0_state_validate.c \
+ nvc0_surface.c \
+ nvc0_tex.c \
+ nvc0_transfer.c \
+ nvc0_vbo.c \
+ nvc0_vbo_translate.c \
+ nvc0_program.c \
+ nvc0_shader_state.c \
+ nvc0_query.c \
+ nve4_compute.c \
+ nvc0_video.c \
+ nvc0_video_bsp.c \
+ nvc0_video_vp.c \
+ nvc0_video_ppp.c
+
+.for _f in ${GALLIUM_SOURCES.drivers/nouveau} \
+ ${GALLIUM_SOURCES.drivers/nouveau/nv30} \
+ ${GALLIUM_SOURCES.drivers/nouveau/nv50} \
+ ${GALLIUM_SOURCES.drivers/nouveau/codegen} \
+ ${GALLIUM_SOURCES.drivers/nouveau/nvc0}
+CPPFLAGS.${_f} += -I${X11SRCDIR.MesaLib}/src/gallium/drivers/nouveau
+.endfor
GALLIUM_SOURCES.winsys/radeon/drm = \
@@ -348,6 +464,9 @@ GALLIUM_SOURCES.winsys/radeon/drm = \
radeon_drm_cs_dump.c \
radeon_drm_winsys.c
+GALLIUM_SOURCES.winsys/nouveau/drm = \
+ nouveau_drm_winsys.c
+
GALLIUM_SOURCES.drivers/softpipe = \
sp_fs_exec.c \
sp_clear.c \
@@ -419,6 +538,7 @@ SRCS+= ${GALLIUM_SOURCES.${_d}}
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
+LIBDPLIBS+= drm_nouveau ${.CURDIR}/../libdrm_nouveau
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
@@ -458,6 +578,7 @@ CPPFLAGS.target.c += \
-DGALLIUM_TRACE \
-DGALLIUM_R200 \
-DGALLIUM_R600 \
+ -DGALLIUM_NOUVEAU \
-DGALLIUM_SOFTPIPE \
-I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
-I${X11SRCDIR.MesaLib}/src/loader \
Index: src/external/mit/xorg/lib/libdrm/drm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/drm/Makefile:1.6 src/external/mit/xorg/lib/libdrm/drm/Makefile:1.6.4.1
--- src/external/mit/xorg/lib/libdrm/drm/Makefile:1.6 Mon Mar 17 08:01:18 2014
+++ src/external/mit/xorg/lib/libdrm/drm/Makefile Mon Dec 12 09:32:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/03/17 08:01:18 mrg Exp $
+# $NetBSD: Makefile,v 1.6.4.1 2016/12/12 09:32:35 msaitoh Exp $
# install include/libdrm files
@@ -7,6 +7,7 @@
.PATH: ${X11SRCDIR.drm}/include/drm
.PATH: ${X11SRCDIR.drm}/intel
.PATH: ${X11SRCDIR.drm}/radeon
+.PATH: ${X11SRCDIR.drm}/nouveau
INCS= drm.h \
drm_fourcc.h \
@@ -18,6 +19,7 @@ INCS= drm.h \
intel_debug.h \
mach64_drm.h \
mga_drm.h \
+ nouveau.h \
nouveau_drm.h \
r128_drm.h \
r600_pci_ids.h \
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.63.10.2 src/external/mit/xorg/server/drivers/Makefile:1.63.10.3
--- src/external/mit/xorg/server/drivers/Makefile:1.63.10.2 Mon Mar 9 08:47:19 2015
+++ src/external/mit/xorg/server/drivers/Makefile Mon Dec 12 09:32:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63.10.2 2015/03/09 08:47:19 snj Exp $
+# $NetBSD: Makefile,v 1.63.10.3 2016/12/12 09:32:35 msaitoh Exp $
# xf86-input drivers
@@ -54,6 +54,7 @@ SUBDIR+= \
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nv \
+ xf86-video-nouveau \
xf86-video-openchrome \
xf86-video-r128 \
xf86-video-${RADEON_SUBDIR} \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.829.2.9 src/share/mk/bsd.own.mk:1.829.2.10
--- src/share/mk/bsd.own.mk:1.829.2.9 Sat Dec 26 21:58:47 2015
+++ src/share/mk/bsd.own.mk Mon Dec 12 09:32:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829.2.9 2015/12/26 21:58:47 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.829.2.10 2016/12/12 09:32:35 msaitoh Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1275,7 +1275,7 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
.for _v in \
ag10e apm ark ast ati ati-kms chips cirrus crime \
geode glint i128 i740 igs imstt intel mach64 mga \
- neomagic newport nsc nv nvxbox openchrome pnozz \
+ neomagic newport nouveau nsc nv nvxbox openchrome pnozz \
r128 radeonhd rendition \
s3 s3virge savage siliconmotion sis suncg14 \
suncg6 sunffb sunleo suntcx \
