[src/trunk]: src Install more libdrm nouveau headers.

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b00bd7428998
branches:  trunk
changeset: 997303:b00bd7428998
user:      maya <maya%NetBSD.org@localhost>
date:      Sun Mar 03 17:52:32 2019 +0000

description:
Install more libdrm nouveau headers.

These will be used by mesa 18.

diffstat:

 distrib/sets/lists/xbase/mi                   |   4 +++-
 distrib/sets/lists/xcomp/md.amd64             |   9 ++++++++-
 distrib/sets/lists/xcomp/md.evbarm            |   9 ++++++++-
 distrib/sets/lists/xcomp/md.i386              |   9 ++++++++-
 etc/mtree/NetBSD.dist.Xorg                    |   4 +++-
 external/mit/xorg/lib/libdrm_nouveau/Makefile |  14 +++++++++++++-
 6 files changed, 43 insertions(+), 6 deletions(-)

diffs (121 lines):

diff -r b4b0ad78a12b -r b00bd7428998 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi       Sun Mar 03 17:46:01 2019 +0000
+++ b/distrib/sets/lists/xbase/mi       Sun Mar 03 17:52:32 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.146 2018/12/30 09:19:04 mrg Exp $
+# $NetBSD: mi,v 1.147 2019/03/03 17:52:32 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -267,6 +267,8 @@
 ./usr/X11R7/include/freetype2/internal                 base-obsolete   obsolete
 ./usr/X11R7/include/freetype2/internal/services                base-obsolete   obsolete
 ./usr/X11R7/include/libdrm                             base-x11-root   xorg
+./usr/X11R7/include/libdrm/nouveau                     base-x11-root   xorg
+./usr/X11R7/include/libdrm/nouveau/nvif                        base-x11-root   xorg
 ./usr/X11R7/include/libkms                             base-x11-root   xorg
 ./usr/X11R7/include/pixman-1                           base-x11-root   xorg
 ./usr/X11R7/include/xcb                                        base-x11-root   xorg
diff -r b4b0ad78a12b -r b00bd7428998 distrib/sets/lists/xcomp/md.amd64
--- a/distrib/sets/lists/xcomp/md.amd64 Sun Mar 03 17:46:01 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.amd64 Sun Mar 03 17:52:32 2019 +0000
@@ -1,5 +1,12 @@
-# $NetBSD: md.amd64,v 1.49 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: md.amd64,v 1.50 2019/03/03 17:52:32 maya Exp $
 ./usr/X11R7/include/intel_bufmgr.h                     -unknown-       obsolete
+./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/class.h                -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/if0002.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h                -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h       -unknown-       xorg
 ./usr/X11R7/lib/libI810XvMC.a                          -unknown-       xorg,compatx11file
 ./usr/X11R7/lib/libI810XvMC_p.a                                -unknown-       profile,xorg,compatx11file
 ./usr/X11R7/lib/libI810XvMC_pic.a                      -unknown-       xorg,picinstall,compatx11file
diff -r b4b0ad78a12b -r b00bd7428998 distrib/sets/lists/xcomp/md.evbarm
--- a/distrib/sets/lists/xcomp/md.evbarm        Sun Mar 03 17:46:01 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.evbarm        Sun Mar 03 17:52:32 2019 +0000
@@ -1,4 +1,11 @@
-# $NetBSD: md.evbarm,v 1.7 2016/01/31 18:40:23 christos Exp $
+# $NetBSD: md.evbarm,v 1.8 2019/03/03 17:52:32 maya Exp $
+./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/class.h                -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/if0002.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h                -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h       -unknown-       xorg
 ./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
diff -r b4b0ad78a12b -r b00bd7428998 distrib/sets/lists/xcomp/md.i386
--- a/distrib/sets/lists/xcomp/md.i386  Sun Mar 03 17:46:01 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.i386  Sun Mar 03 17:52:32 2019 +0000
@@ -1,6 +1,13 @@
-# $NetBSD: md.i386,v 1.54 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: md.i386,v 1.55 2019/03/03 17:52:32 maya Exp $
 #./usr/libdata/lint/llib-lIntelXvMC.ln                 -unknown-       lint,xorg
 ./usr/X11R7/include/intel_bufmgr.h                     -unknown-       obsolete
+./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/class.h                -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/if0002.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h       -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h                -unknown-       xorg
+./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h       -unknown-       xorg
 ./usr/X11R7/lib/libI810XvMC.a                          -unknown-       xorg
 ./usr/X11R7/lib/libI810XvMC_p.a                                -unknown-       profile,xorg
 ./usr/X11R7/lib/libI810XvMC_pic.a                      -unknown-       xorg,picinstall
diff -r b4b0ad78a12b -r b00bd7428998 etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg        Sun Mar 03 17:46:01 2019 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg        Sun Mar 03 17:52:32 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.Xorg,v 1.22 2017/08/29 07:53:54 mrg Exp $
+#      $NetBSD: NetBSD.dist.Xorg,v 1.23 2019/03/03 17:52:32 maya Exp $
 ./usr/X11R7
 ./usr/X11R7/bin
 ./usr/X11R7/include
@@ -27,6 +27,8 @@
 ./usr/X11R7/include/freetype2/freetype/cache
 ./usr/X11R7/include/freetype2/freetype/config
 ./usr/X11R7/include/libdrm
+./usr/X11R7/include/libdrm/nouveau
+./usr/X11R7/include/libdrm/nouveau/nvif
 ./usr/X11R7/include/libkms
 ./usr/X11R7/include/pixman-1
 ./usr/X11R7/include/xcb
diff -r b4b0ad78a12b -r b00bd7428998 external/mit/xorg/lib/libdrm_nouveau/Makefile
--- a/external/mit/xorg/lib/libdrm_nouveau/Makefile     Sun Mar 03 17:46:01 2019 +0000
+++ b/external/mit/xorg/lib/libdrm_nouveau/Makefile     Sun Mar 03 17:52:32 2019 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2016/08/21 18:23:33 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2019/03/03 17:52:32 maya Exp $
 
 .include <bsd.own.mk>
 
 LIB=   drm_nouveau
 .PATH: ${X11SRCDIR.drm}
 .PATH: ${X11SRCDIR.drm}/nouveau
+.PATH: ${X11SRCDIR.drm}/nouveau/nvif
 
 SRCS=  nouveau.c \
        pushbuf.c \
@@ -21,6 +22,17 @@
 PKGCONFIG=     libdrm_nouveau
 PKGDIST=       drm
 
+INCS=  cl0080.h \
+       cl9097.h \
+       class.h \
+       if0002.h \
+       if0003.h \
+       ioctl.h \
+       unpack.h
+
+INCSDIR=${X11INCDIR}/libdrm/nouveau/nvif
+
+
 .include "../libdrm/Makefile.defines"
 
 .include <bsd.x11.mk>