Module Name: src
Committed By: mrg
Date: Sun Mar 10 11:18:03 UTC 2019
Modified Files:
src/distrib/sets/lists/xbase: md.amd64 md.i386 mi
src/distrib/sets/lists/xcomp: md.amd64 md.evbarm md.i386 mi
src/distrib/sets/lists/xdebug: md.amd64 md.evbarm md.evbarm.armeb
md.i386
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/lib: Makefile
Added Files:
src/external/mit/xorg/include/libvdpau: Makefile
src/external/mit/xorg/lib/libvdpau: Makefile
Log Message:
- build and install libvdpau and x86 and evbarm.
- add khrplatform.h for mesa_ver=18 platforms.
need to enable libvdpau.pc generation (needs special rules)
this mostly comes from maya in the first one, and a small part
of the second:
commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <m...@netbsd.org>
Date: Sun Feb 24 09:31:22 2019 +0200
More of vdpau. Cogs spin.
commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <m...@netbsd.org>
Date: Sat Feb 23 22:36:37 2019 +0200
Adjust for MesaLib 18.
Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xbase/md.i386
cvs rdiff -u -r1.148 -r1.149 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xcomp/md.evbarm
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.205 -r1.206 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.evbarm.armeb
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.23 -r1.24 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/libvdpau/Makefile
cvs rdiff -u -r1.46 -r1.47 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libvdpau/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.16 src/distrib/sets/lists/xbase/md.amd64:1.17
--- src/distrib/sets/lists/xbase/md.amd64:1.16 Wed Aug 17 03:10:22 2016
+++ src/distrib/sets/lists/xbase/md.amd64 Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.16 2016/08/17 03:10:22 mrg Exp $
+# $NetBSD: md.amd64,v 1.17 2019/03/10 11:18:02 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
@@ -20,4 +20,7 @@
./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libdrm_nouveau.so.3 -unknown- xorg,compatx11file
./usr/X11R7/lib/libdrm_nouveau.so.3.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau.so.1.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.30 src/distrib/sets/lists/xbase/md.i386:1.31
--- src/distrib/sets/lists/xbase/md.i386:1.30 Wed Aug 17 03:10:22 2016
+++ src/distrib/sets/lists/xbase/md.i386 Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.30 2016/08/17 03:10:22 mrg Exp $
+# $NetBSD: md.i386,v 1.31 2019/03/10 11:18:02 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
@@ -20,4 +20,7 @@
./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg
./usr/X11R7/lib/libdrm_nouveau.so.3 -unknown- xorg
./usr/X11R7/lib/libdrm_nouveau.so.3.0 -unknown- xorg
+./usr/X11R7/lib/libvdpau.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau.so.1.0 -unknown- xorg,compatx11file
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.148 src/distrib/sets/lists/xbase/mi:1.149
--- src/distrib/sets/lists/xbase/mi:1.148 Fri Mar 8 09:58:23 2019
+++ src/distrib/sets/lists/xbase/mi Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.148 2019/03/08 09:58:23 mrg Exp $
+# $NetBSD: mi,v 1.149 2019/03/10 11:18:02 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -147,6 +147,8 @@
./usr/X11R7/include/DPS base-x11-root xorg
./usr/X11R7/include/GL base-x11-root xorg
./usr/X11R7/include/GL/internal base-x11-root xorg
+./usr/X11R7/include/KHR base-x11-root xorg
+./usr/X11R7/include/vdpau base-x11-root xorg
./usr/X11R7/include/X11 base-x11-root xorg
./usr/X11R7/include/X11/ICE base-x11-root xorg
./usr/X11R7/include/X11/PM base-x11-root xorg
Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.50 src/distrib/sets/lists/xcomp/md.amd64:1.51
--- src/distrib/sets/lists/xcomp/md.amd64:1.50 Sun Mar 3 17:52:32 2019
+++ src/distrib/sets/lists/xcomp/md.amd64 Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.50 2019/03/03 17:52:32 maya Exp $
+# $NetBSD: md.amd64,v 1.51 2019/03/10 11:18:02 mrg 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
@@ -7,6 +7,9 @@
./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/include/khrplatform.h -unknown- xorg,mesa_ver=18
+./usr/X11R7/include/vdpau/vdpau.h -unknown- xorg
+./usr/X11R7/include/vdpau/vdpau_x11.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
@@ -28,6 +31,10 @@
./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/libvdpau.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libvdpau_pic.a -unknown- xorg,picinstall,compatx11file
+#./usr/X11R7/lib/pkgconfig/libvdpau.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg
Index: src/distrib/sets/lists/xcomp/md.evbarm
diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.8 src/distrib/sets/lists/xcomp/md.evbarm:1.9
--- src/distrib/sets/lists/xcomp/md.evbarm:1.8 Sun Mar 3 17:52:32 2019
+++ src/distrib/sets/lists/xcomp/md.evbarm Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.8 2019/03/03 17:52:32 maya Exp $
+# $NetBSD: md.evbarm,v 1.9 2019/03/10 11:18:02 mrg 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
@@ -6,8 +6,15 @@
./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/include/khrplatform.h -unknown- xorg,mesa_ver=18
+./usr/X11R7/include/vdpau/vdpau.h -unknown- xorg
+./usr/X11R7/include/vdpau/vdpau_x11.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
+./usr/X11R7/lib/libvdpau.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libvdpau_pic.a -unknown- xorg,picinstall,compatx11file
+#./usr/X11R7/lib/pkgconfig/libvdpau.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- 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.55 src/distrib/sets/lists/xcomp/md.i386:1.56
--- src/distrib/sets/lists/xcomp/md.i386:1.55 Sun Mar 3 17:52:32 2019
+++ src/distrib/sets/lists/xcomp/md.i386 Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.55 2019/03/03 17:52:32 maya Exp $
+# $NetBSD: md.i386,v 1.56 2019/03/10 11:18:02 mrg 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
@@ -8,6 +8,9 @@
./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/include/khrplatform.h -unknown- xorg,mesa_ver=18
+./usr/X11R7/include/vdpau/vdpau.h -unknown- xorg
+./usr/X11R7/include/vdpau/vdpau_x11.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
@@ -29,6 +32,10 @@
./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/libvdpau.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libvdpau_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libvdpau_pic.a -unknown- xorg,picinstall,compatx11file
+#./usr/X11R7/lib/pkgconfig/libvdpau.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.205 src/distrib/sets/lists/xcomp/mi:1.206
--- src/distrib/sets/lists/xcomp/mi:1.205 Sat Mar 9 18:38:34 2019
+++ src/distrib/sets/lists/xcomp/mi Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.205 2019/03/09 18:38:34 kamil Exp $
+# $NetBSD: mi,v 1.206 2019/03/10 11:18:02 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -29,7 +29,8 @@
./usr/X11R7/include/GL/internal/sarea.h -unknown- obsolete
./usr/X11R7/include/GL/osmesa.h -unknown- xorg
./usr/X11R7/include/GL/wglext.h -unknown- xorg
-./usr/X11R7/include/GL/wmesa.h -unknown- xorg
+./usr/X11R7/include/GL/wmesa.h -unknown- xorg,obsolete,mesa_ver=18
+./usr/X11R7/include/GL/wmesa.h -unknown- xorg,mesa_ver=10
./usr/X11R7/include/GL/xmesa.h -unknown- obsolete
./usr/X11R7/include/GL/xmesa_x.h -unknown- obsolete
./usr/X11R7/include/GL/xmesa_xf86.h -unknown- obsolete
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.43 src/distrib/sets/lists/xdebug/md.amd64:1.44
--- src/distrib/sets/lists/xdebug/md.amd64:1.43 Fri Mar 8 12:18:41 2019
+++ src/distrib/sets/lists/xdebug/md.amd64 Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.43 2019/03/08 12:18:41 mrg Exp $
+# $NetBSD: md.amd64,v 1.44 2019/03/10 11:18:02 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
@@ -40,6 +40,7 @@
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.2.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug -unknown- xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.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
Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.18 src/distrib/sets/lists/xdebug/md.evbarm:1.19
--- src/distrib/sets/lists/xdebug/md.evbarm:1.18 Mon Dec 31 11:59:23 2018
+++ src/distrib/sets/lists/xdebug/md.evbarm Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.18 2018/12/31 11:59:23 mrg Exp $
+# $NetBSD: md.evbarm,v 1.19 2019/03/10 11:18:02 mrg Exp $
./usr/X11R7/lib/libdrm_nouveau_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete
@@ -19,6 +19,7 @@
./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug obsolete xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.evbarm.armeb
diff -u src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.10 src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.11
--- src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.10 Mon Dec 31 11:59:23 2018
+++ src/distrib/sets/lists/xdebug/md.evbarm.armeb Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm.armeb,v 1.10 2018/12/31 11:59:23 mrg Exp $
+# $NetBSD: md.evbarm.armeb,v 1.11 2019/03/10 11:18:02 mrg Exp $
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete
@@ -22,6 +22,7 @@
./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug obsolete xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.40 src/distrib/sets/lists/xdebug/md.i386:1.41
--- src/distrib/sets/lists/xdebug/md.i386:1.40 Fri Mar 8 12:18:41 2019
+++ src/distrib/sets/lists/xdebug/md.i386 Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.40 2019/03/08 12:18:41 mrg Exp $
+# $NetBSD: md.i386,v 1.41 2019/03/10 11:18:02 mrg 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
@@ -6,6 +6,7 @@
./usr/X11R7/lib/libdrm_amdgpu_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/libvdpau_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
@@ -51,6 +52,7 @@
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug -unknown- xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.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
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.23 src/etc/mtree/NetBSD.dist.Xorg:1.24
--- src/etc/mtree/NetBSD.dist.Xorg:1.23 Sun Mar 3 17:52:32 2019
+++ src/etc/mtree/NetBSD.dist.Xorg Sun Mar 10 11:18:02 2019
@@ -1,10 +1,11 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.23 2019/03/03 17:52:32 maya Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.24 2019/03/10 11:18:02 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
./usr/X11R7/include/DPS
./usr/X11R7/include/GL
./usr/X11R7/include/GL/internal
+./usr/X11R7/include/KHR
./usr/X11R7/include/X11
./usr/X11R7/include/X11/ICE
./usr/X11R7/include/X11/PM
@@ -31,6 +32,7 @@
./usr/X11R7/include/libdrm/nouveau/nvif
./usr/X11R7/include/libkms
./usr/X11R7/include/pixman-1
+./usr/X11R7/include/vdpau
./usr/X11R7/include/xcb
./usr/X11R7/include/xorg
./usr/X11R7/lib
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.7 src/external/mit/xorg/include/Makefile:1.8
--- src/external/mit/xorg/include/Makefile:1.7 Wed Mar 14 23:41:05 2018
+++ src/external/mit/xorg/include/Makefile Sun Mar 10 11:18:02 2019
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2018/03/14 23:41:05 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2019/03/10 11:18:02 mrg Exp $
# *proto packages for xorg
-SUBDIR= xorgproto
-SUBDIR+= xbitmaps xcb-proto .WAIT xtrans
+.include <bsd.own.mk>
+
+.if ${HAVE_MESA_VER} == 18
+SUBDIR= KHR
+.endif
+SUBDIR+= libvdpau xorgproto xbitmaps xcb-proto
+SUBDIR+= .WAIT xtrans
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.46 src/external/mit/xorg/lib/Makefile:1.47
--- src/external/mit/xorg/lib/Makefile:1.46 Sun Mar 10 02:29:52 2019
+++ src/external/mit/xorg/lib/Makefile Sun Mar 10 11:18:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2019/03/10 02:29:52 mrg Exp $
+# $NetBSD: Makefile,v 1.47 2019/03/10 11:18:02 mrg Exp $
# build libraries for xorg
@@ -12,7 +12,7 @@ SUBDIR= libfontenc freetype libFS libICE
SUBDIR+=libdrm_intel libdrm_amdgpu
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
-SUBDIR+=libdrm_nouveau
+SUBDIR+=libdrm_nouveau libvdpau
.endif
SUBDIR+=libdrm_radeon pixman
.if !defined(MLIBDIR)
Added files:
Index: src/external/mit/xorg/include/libvdpau/Makefile
diff -u /dev/null src/external/mit/xorg/include/libvdpau/Makefile:1.1
--- /dev/null Sun Mar 10 11:18:03 2019
+++ src/external/mit/xorg/include/libvdpau/Makefile Sun Mar 10 11:18:02 2019
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 11:18:02 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.vdpau}/include/vdpau
+
+INCS= vdpau.h vdpau_x11.h
+INCSDIR=${X11INCDIR}/vdpau
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/libvdpau/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libvdpau/Makefile:1.1
--- /dev/null Sun Mar 10 11:18:03 2019
+++ src/external/mit/xorg/lib/libvdpau/Makefile Sun Mar 10 11:18:02 2019
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2019/03/10 11:18:02 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= vdpau
+
+.PATH: ${X11SRCDIR.vdpau}/src
+
+SRCS= vdpau_wrapper.c \
+ mesa_dri2.c
+
+VDPAU_SYSCONFDIR= ${X11ETCDIR}/vdpau
+VDPAU_MODULEDIR= ${X11LIBDIR}/vdpau
+
+CFLAGS+= -DVDPAU_SYSCONFDIR=\"${VDPAU_SYSCONFDIR}\" \
+ -DVDPAU_MODULEDIR=\"${VDPAU_MODULEDIR}\"
+
+SHLIB_MAJOR= 1
+SHLIB_MINOR= 0
+
+# XXX todo
+#PKGDIST= libvdpau
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
