Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src - build and install libvdpau and x86 and evbarm.
details: https://anonhg.NetBSD.org/src/rev/87393b00b368
branches: trunk
changeset: 449539:87393b00b368
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Mar 10 11:18:02 2019 +0000
description:
- 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 <maya%NetBSD.org@localhost>
Date: Sun Feb 24 09:31:22 2019 +0200
More of vdpau. Cogs spin.
commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya%NetBSD.org@localhost>
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.
diffstat:
distrib/sets/lists/xbase/md.amd64 | 5 ++++-
distrib/sets/lists/xbase/md.i386 | 5 ++++-
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 ++++++++-
distrib/sets/lists/xcomp/mi | 5 +++--
distrib/sets/lists/xdebug/md.amd64 | 3 ++-
distrib/sets/lists/xdebug/md.evbarm | 3 ++-
distrib/sets/lists/xdebug/md.evbarm.armeb | 3 ++-
distrib/sets/lists/xdebug/md.i386 | 4 +++-
etc/mtree/NetBSD.dist.Xorg | 4 +++-
external/mit/xorg/include/Makefile | 11 ++++++++---
external/mit/xorg/include/libvdpau/Makefile | 11 +++++++++++
external/mit/xorg/lib/Makefile | 4 ++--
external/mit/xorg/lib/libvdpau/Makefile | 25 +++++++++++++++++++++++++
16 files changed, 96 insertions(+), 18 deletions(-)
diffs (truncated from 338 to 300 lines):
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xbase/md.amd64
--- a/distrib/sets/lists/xbase/md.amd64 Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xbase/md.amd64 Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xbase/md.i386
--- a/distrib/sets/lists/xbase/md.i386 Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xbase/md.i386 Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xbase/mi Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xcomp/md.amd64
--- a/distrib/sets/lists/xcomp/md.amd64 Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.amd64 Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xcomp/md.evbarm
--- a/distrib/sets/lists/xcomp/md.evbarm Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.evbarm Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xcomp/md.i386
--- a/distrib/sets/lists/xcomp/md.i386 Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.i386 Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xcomp/mi Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xdebug/md.amd64
--- a/distrib/sets/lists/xdebug/md.amd64 Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xdebug/md.amd64 Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xdebug/md.evbarm
--- a/distrib/sets/lists/xdebug/md.evbarm Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xdebug/md.evbarm Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xdebug/md.evbarm.armeb
--- a/distrib/sets/lists/xdebug/md.evbarm.armeb Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xdebug/md.evbarm.armeb Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 distrib/sets/lists/xdebug/md.i386
--- a/distrib/sets/lists/xdebug/md.i386 Sun Mar 10 11:10:21 2019 +0000
+++ b/distrib/sets/lists/xdebug/md.i386 Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg Sun Mar 10 11:10:21 2019 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg Sun Mar 10 11:18:02 2019 +0000
@@ -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
diff -r 55793fa6d431 -r 87393b00b368 external/mit/xorg/include/Makefile
--- a/external/mit/xorg/include/Makefile Sun Mar 10 11:10:21 2019 +0000
+++ b/external/mit/xorg/include/Makefile Sun Mar 10 11:18:02 2019 +0000
@@ -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>
diff -r 55793fa6d431 -r 87393b00b368 external/mit/xorg/include/libvdpau/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/include/libvdpau/Makefile Sun Mar 10 11:18:02 2019 +0000
@@ -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>
diff -r 55793fa6d431 -r 87393b00b368 external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Sun Mar 10 11:10:21 2019 +0000
+++ b/external/mit/xorg/lib/Makefile Sun Mar 10 11:18:02 2019 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index