Module Name: src
Committed By: mrg
Date: Tue Oct 13 04:33:22 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: md.amd64 md.i386
src/distrib/sets/lists/xcomp: md.amd64 md.i386
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/server/drivers: Makefile
Added Files:
src/external/mit/xorg/lib/libdrm_nouveau: Makefile shlib_version
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
Log Message:
build libdrm_nouveau and xf86-video-nouveau on x86.
crashes early when starting so far.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libdrm_nouveau/Makefile \
src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
cvs rdiff -u -r1.69 -r1.70 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
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.14 src/distrib/sets/lists/xbase/md.amd64:1.15
--- src/distrib/sets/lists/xbase/md.amd64:1.14 Mon Jul 20 02:52:57 2015
+++ src/distrib/sets/lists/xbase/md.amd64 Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.14 2015/07/20 02:52:57 mrg Exp $
+# $NetBSD: md.amd64,v 1.15 2015/10/13 04:33:22 mrg Exp $
./usr/X11R7/lib/libI810XvMC.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg,compatx11file
./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg,compatx11file
@@ -14,4 +14,7 @@
./usr/X11R7/lib/libdrm_intel.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libdrm_intel.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.2.0 -unknown- xorg,compatx11file
./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.28 src/distrib/sets/lists/xbase/md.i386:1.29
--- src/distrib/sets/lists/xbase/md.i386:1.28 Mon Jul 20 02:52:57 2015
+++ src/distrib/sets/lists/xbase/md.i386 Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.28 2015/07/20 02:52:57 mrg Exp $
+# $NetBSD: md.i386,v 1.29 2015/10/13 04:33:22 mrg 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.1 -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.42 src/distrib/sets/lists/xcomp/md.amd64:1.43
--- src/distrib/sets/lists/xcomp/md.amd64:1.42 Wed Jul 29 19:44:01 2015
+++ src/distrib/sets/lists/xcomp/md.amd64 Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.42 2015/07/29 19:44:01 christos Exp $
+# $NetBSD: md.amd64,v 1.43 2015/10/13 04:33:22 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
@@ -86,15 +86,19 @@
./usr/X11R7/lib/libdrm_intel.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau_pic.a -unknown- xorg,picinstall,compatx11file
./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-lIntelXvMC.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-ldbe.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldri.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldri2.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lexa.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lextmod.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lfb.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.47 src/distrib/sets/lists/xcomp/md.i386:1.48
--- src/distrib/sets/lists/xcomp/md.i386:1.47 Thu Sep 24 20:27:40 2015
+++ src/distrib/sets/lists/xcomp/md.i386 Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.47 2015/09/24 20:27:40 christos Exp $
+# $NetBSD: md.i386,v 1.48 2015/10/13 04:33:22 mrg 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,7 +87,11 @@
./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
@@ -95,6 +99,7 @@
./usr/libdata/lint/llib-ldri.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldri2.ln -unknown- lint,xorg
./usr/libdata/lint/llib-ldrm_intel.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lexa.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lextmod.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lfb.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.21 src/distrib/sets/lists/xdebug/md.amd64:1.22
--- src/distrib/sets/lists/xdebug/md.amd64:1.21 Wed Jul 29 19:44:47 2015
+++ src/distrib/sets/lists/xdebug/md.amd64 Tue Oct 13 04:33:22 2015
@@ -1,9 +1,10 @@
-# $NetBSD: md.amd64,v 1.21 2015/07/29 19:44:47 christos Exp $
+# $NetBSD: md.amd64,v 1.22 2015/10/13 04:33:22 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau_g.a -unknown- debuglib,xorg,compatx11file
./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,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug -unknown- xorg,debug,compatx11file
./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
@@ -143,6 +145,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.20 src/distrib/sets/lists/xdebug/md.i386:1.21
--- src/distrib/sets/lists/xdebug/md.i386:1.20 Thu Sep 24 20:27:40 2015
+++ src/distrib/sets/lists/xdebug/md.i386 Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.20 2015/09/24 20:27:40 christos Exp $
+# $NetBSD: md.i386,v 1.21 2015/10/13 04:33:22 mrg 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.1.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.84 src/distrib/sets/lists/xserver/md.amd64:1.85
--- src/distrib/sets/lists/xserver/md.amd64:1.84 Sat Sep 19 23:00:44 2015
+++ src/distrib/sets/lists/xserver/md.amd64 Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.84 2015/09/19 23:00:44 wiz Exp $
+# $NetBSD: md.amd64,v 1.85 2015/10/13 04:33:22 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -439,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
@@ -720,6 +722,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.102 src/distrib/sets/lists/xserver/md.i386:1.103
--- src/distrib/sets/lists/xserver/md.i386:1.102 Sat Sep 19 23:00:44 2015
+++ src/distrib/sets/lists/xserver/md.i386 Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.102 2015/09/19 23:00:44 wiz Exp $
+# $NetBSD: md.i386,v 1.103 2015/10/13 04:33:22 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -479,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
@@ -763,6 +765,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.35 src/external/mit/xorg/lib/Makefile:1.36
--- src/external/mit/xorg/lib/Makefile:1.35 Thu Jul 23 05:46:39 2015
+++ src/external/mit/xorg/lib/Makefile Tue Oct 13 04:33:21 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/07/23 05:46:39 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2015/10/13 04:33:21 mrg Exp $
# build libraries for xorg
@@ -7,7 +7,7 @@
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
.if !defined(MLIBDIR)
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.69 src/external/mit/xorg/server/drivers/Makefile:1.70
--- src/external/mit/xorg/server/drivers/Makefile:1.69 Wed Sep 30 22:58:02 2015
+++ src/external/mit/xorg/server/drivers/Makefile Tue Oct 13 04:33:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2015/09/30 22:58:02 rjs Exp $
+# $NetBSD: Makefile,v 1.70 2015/10/13 04:33:22 mrg Exp $
# xf86-input drivers
@@ -48,6 +48,7 @@ SUBDIR+= \
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nv \
+ xf86-video-nouveau \
xf86-video-openchrome \
xf86-video-r128 \
xf86-video-radeon \
Added files:
Index: src/external/mit/xorg/lib/libdrm_nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/Makefile:1.1
--- /dev/null Tue Oct 13 04:33:22 2015
+++ src/external/mit/xorg/lib/libdrm_nouveau/Makefile Tue Oct 13 04:33:21 2015
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/10/13 04:33:21 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= drm_nouveau
+.PATH: ${X11SRCDIR.drm}
+.PATH: ${X11SRCDIR.drm}/nouveau
+
+SRCS= nouveau.c \
+ pushbuf.c \
+ bufctx.c \
+ abi16.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
+
+LIBDPLIBS= drm ${.CURDIR}/../libdrm
+
+PKGCONFIG= libdrm_nouveau
+PKGDIST= drm
+
+.include "../libdrm/Makefile.defines"
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libdrm_nouveau/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libdrm_nouveau/shlib_version:1.1
--- /dev/null Tue Oct 13 04:33:22 2015
+++ src/external/mit/xorg/lib/libdrm_nouveau/shlib_version Tue Oct 13 04:33:21 2015
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2015/10/13 04:33:21 mrg Exp $
+#
+major=2
+minor=0
Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.1
--- /dev/null Tue Oct 13 04:33:22 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Tue Oct 13 04:33:22 2015
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile,v 1.1 2015/10/13 04:33:22 mrg Exp $
+
+DRIVER= xf86-video-nouveau
+DRIVER_NAME= nouveau_drv
+
+SRCS= nouveau_copy.c \
+ nouveau_copy85b5.c \
+ nouveau_copy90b5.c \
+ nouveau_copya0b5.c \
+ nouveau_exa.c \
+ nouveau_xv.c \
+ nouveau_dri2.c \
+ nouveau_glamor.c \
+ nouveau_present.c \
+ nouveau_sync.c \
+ nouveau_wfb.c \
+ nv_accel_common.c \
+ nv_driver.c \
+ nv_shadow.c \
+ nv04_exa.c \
+ nv04_xv_ovl.c \
+ nv04_xv_blit.c \
+ nv10_exa.c \
+ nv10_xv_ovl.c \
+ nv30_exa.c \
+ nv30_xv_tex.c \
+ nv40_exa.c \
+ nv40_xv_tex.c \
+ nv50_accel.c \
+ nv50_exa.c \
+ nv50_xv.c \
+ nvc0_accel.c \
+ nvc0_exa.c \
+ nvc0_xv.c \
+ drmmode_display.c \
+ vl_hwmc.c
+
+LIBDPLIBS+= drm_nouveau ${.CURDIR}/../../../lib/libdrm_nouveau
+
+MAN= nouveau.4
+
+CPPFLAGS+= -DHAVE_XAA_H
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+
+CPPFLAGS+= -DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
+CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_MINOR}
+CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
+CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
+
+.include "../Makefile.xf86-driver"
+
+# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
+DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog
