Module Name: src
Committed By: jmcneill
Date: Sun Jan 19 00:58:15 UTC 2020
Modified Files:
src/distrib/sets/lists/xbase: md.evbarm mi
src/distrib/sets/lists/xcomp: md.evbarm
src/distrib/sets/lists/xdebug: md.evbarm
src/distrib/sets/lists/xserver: md.evbarm
src/etc/mtree: NetBSD.dist.Xorg
src/external/apache2/llvm/librt: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
Build radeon and nouveau drivers on evbarm.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xbase/md.evbarm
cvs rdiff -u -r1.154 -r1.155 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xcomp/md.evbarm
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xserver/md.evbarm
cvs rdiff -u -r1.25 -r1.26 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.2 -r1.3 src/external/apache2/llvm/librt/Makefile
cvs rdiff -u -r1.50 -r1.51 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.97 -r1.98 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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.evbarm
diff -u src/distrib/sets/lists/xbase/md.evbarm:1.5 src/distrib/sets/lists/xbase/md.evbarm:1.6
--- src/distrib/sets/lists/xbase/md.evbarm:1.5 Mon Aug 12 03:48:32 2019
+++ src/distrib/sets/lists/xbase/md.evbarm Sun Jan 19 00:58:13 2020
@@ -1,4 +1,7 @@
-# $NetBSD: md.evbarm,v 1.5 2019/08/12 03:48:32 uki Exp $
+# $NetBSD: md.evbarm,v 1.6 2020/01/19 00:58:13 jmcneill Exp $
+./usr/X11R7/lib/libdrm_amdgpu.so xbase-libdrm_amdgpu-lib xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.so.1 xbase-libdrm_amdgpu-lib xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.so.1.0 xbase-libdrm_amdgpu-lib xorg,compatx11file
./usr/X11R7/lib/libdrm_nouveau.so xbase-libdrm_nouveau-lib xorg
./usr/X11R7/lib/libdrm_nouveau.so.3 xbase-libdrm_nouveau-lib xorg
./usr/X11R7/lib/libdrm_nouveau.so.3.0 xbase-libdrm_nouveau-lib xorg
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.154 src/distrib/sets/lists/xbase/mi:1.155
--- src/distrib/sets/lists/xbase/mi:1.154 Tue Aug 20 12:08:17 2019
+++ src/distrib/sets/lists/xbase/mi Sun Jan 19 00:58:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.154 2019/08/20 12:08:17 uki Exp $
+# $NetBSD: mi,v 1.155 2020/01/19 00:58:13 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1395,6 +1395,7 @@
./usr/X11R7/man/cat1/xwud.0 xbase-xwud-catman .cat,xorg
./usr/X11R7/man/cat3 base-x11-root xorg
./usr/X11R7/man/cat4 base-x11-root xorg
+./usr/X11R7/man/cat4/evbarm base-x11-root xorg
./usr/X11R7/man/cat4/x86 base-x11-root xorg
./usr/X11R7/man/cat5 base-x11-root xorg
./usr/X11R7/man/cat5/fonts-conf.0 xbase-x11-catman .cat,xorg
@@ -1541,6 +1542,7 @@
./usr/X11R7/man/html1/xwud.html xbase-xwud-htmlman html,xorg
./usr/X11R7/man/html3 base-x11-root xorg
./usr/X11R7/man/html4 base-x11-root xorg
+./usr/X11R7/man/html4/evbarm base-x11-root xorg
./usr/X11R7/man/html4/x86 base-x11-root xorg
./usr/X11R7/man/html5 base-x11-root xorg
./usr/X11R7/man/html5/fonts-conf.html xbase-x11-htmlman html,xorg
@@ -1688,6 +1690,7 @@
./usr/X11R7/man/man1/xwud.1 xbase-xwud-man .man,xorg
./usr/X11R7/man/man3 base-x11-root xorg
./usr/X11R7/man/man4 base-x11-root xorg
+./usr/X11R7/man/man4/evbarm base-x11-root xorg
./usr/X11R7/man/man4/x86 base-x11-root xorg
./usr/X11R7/man/man5 base-x11-root xorg
./usr/X11R7/man/man5/fonts-conf.5 xbase-x11-man .man,xorg
Index: src/distrib/sets/lists/xcomp/md.evbarm
diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.15 src/distrib/sets/lists/xcomp/md.evbarm:1.16
--- src/distrib/sets/lists/xcomp/md.evbarm:1.15 Thu Sep 12 09:45:43 2019
+++ src/distrib/sets/lists/xcomp/md.evbarm Sun Jan 19 00:58:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.15 2019/09/12 09:45:43 uki Exp $
+# $NetBSD: md.evbarm,v 1.16 2020/01/19 00:58:13 jmcneill Exp $
./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h xcomp-libdrm-include xorg
./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h xcomp-libdrm-include xorg
./usr/X11R7/include/libdrm/nouveau/nvif/class.h xcomp-libdrm-include xorg
@@ -8,13 +8,18 @@
./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h xcomp-libdrm-include xorg
./usr/X11R7/include/vdpau/vdpau.h xcomp-vdpau-include xorg
./usr/X11R7/include/vdpau/vdpau_x11.h xcomp-vdpau-include xorg
+./usr/X11R7/lib/libdrm_amdgpu.a xcomp-libdrm_amdgpu-lib xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu_p.a xcomp-libdrm_amdgpu-lib profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu_pic.a xcomp-libdrm_amdgpu-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libdrm_nouveau.a xcomp-libdrm_nouveau-lib xorg,compatx11file
./usr/X11R7/lib/libdrm_nouveau_p.a xcomp-libdrm_nouveau-lib profile,xorg,compatx11file
./usr/X11R7/lib/libdrm_nouveau_pic.a xcomp-libdrm_nouveau-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libvdpau.a xcomp-vdpau-lib xorg,compatx11file
./usr/X11R7/lib/libvdpau_p.a xcomp-vdpau-lib profile,xorg,compatx11file
./usr/X11R7/lib/libvdpau_pic.a xcomp-vdpau-lib xorg,picinstall,compatx11file
+./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc xcomp-libdrm_amdgpu-lib xorg
./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc xcomp-libdrm_nouveau-lib xorg
./usr/X11R7/lib/pkgconfig/vdpau.pc xcomp-vdpau-lib xorg
+./usr/libdata/lint/llib-ldrm_amdgpu.ln xcomp-libdrm_amdgpu-lib lint,xorg
./usr/libdata/lint/llib-ldrm_nouveau.ln xcomp-libdrm_nouveau-lib lint,xorg
./usr/libdata/lint/llib-lvdpau.ln xcomp-vdpau-lib lint,xorg
Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.24 src/distrib/sets/lists/xdebug/md.evbarm:1.25
--- src/distrib/sets/lists/xdebug/md.evbarm:1.24 Mon Dec 30 05:37:19 2019
+++ src/distrib/sets/lists/xdebug/md.evbarm Sun Jan 19 00:58:14 2020
@@ -1,4 +1,5 @@
-# $NetBSD: md.evbarm,v 1.24 2019/12/30 05:37:19 uki Exp $
+# $NetBSD: md.evbarm,v 1.25 2020/01/19 00:58:14 jmcneill Exp $
+./usr/X11R7/lib/libdrm_amdgpu_g.a xdebug-libdrm_amdgpu-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libdrm_nouveau_g.a xdebug-libdrm_nouveau-debuglib xorg,debuglib
./usr/X11R7/lib/libvdpau_g.a xdebug-libvdpau-debuglib xorg,debuglib
./usr/X11R7/lib/modules/extensions/libdbe_g.a xdebug-obsolete xorg,obsolete
@@ -19,9 +20,15 @@
./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/cvt.debug xdebug-xorg-server-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.1.0.debug xdebug-libdrm_amdgpu-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug xdebug-libdrm_nouveau-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug xdebug-libvdpau-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0.debug xdebug-dri-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug xdebug-dri-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r300_dri.so.0.debug xdebug-gallium-debug xorg,debug,llvmrt
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/r600_dri.so.0.debug xdebug-xf86-video-radeon-debug xorg,debug,llvmrt
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug xdebug-xf86-video-radeon-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug xdebug-xf86-input-keyboard-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug xdebug-obsolete xorg,obsolete
@@ -29,6 +36,9 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/modesetting_drv.so.0.debug xdebug-modesetting-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug xdebug-xf86-input-mouse-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug xdebug-xf86-video-nouveau-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.19.debug xdebug-xf86-video-radeon-kms-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug xdebug-xf86-video-radeon-kms-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug xdebug-xf86-input-ws-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug xdebug-xf86-video-wsfb-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u src/distrib/sets/lists/xserver/md.evbarm:1.17 src/distrib/sets/lists/xserver/md.evbarm:1.18
--- src/distrib/sets/lists/xserver/md.evbarm:1.17 Sat Oct 26 07:31:39 2019
+++ src/distrib/sets/lists/xserver/md.evbarm Sun Jan 19 00:58:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.17 2019/10/26 07:31:39 uki Exp $
+# $NetBSD: md.evbarm,v 1.18 2020/01/19 00:58:14 jmcneill Exp $
./usr/X11R7/bin/X xserver-xorg-server-bin xorg
./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg
./usr/X11R7/bin/cvt xserver-xorg-server-bin xorg
@@ -6,14 +6,30 @@
./usr/X11R7/lib/X11/doc/README.DRI xserver-obsolete obsolete
./usr/X11R7/lib/X11/doc/README.modes xserver-xorg-server-lib xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess xserver-obsolete obsolete
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so xserver-dri-drivers xorg
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0 xserver-dri-drivers xorg
./usr/X11R7/lib/modules/dri/nouveau_dri.so xserver-xf86-video-nouveau-drivers xorg
./usr/X11R7/lib/modules/dri/nouveau_dri.so.0 xserver-xf86-video-nouveau-drivers xorg
+./usr/X11R7/lib/modules/dri/r200_dri.so xserver-dri-drivers xorg
+./usr/X11R7/lib/modules/dri/r200_dri.so.0 xserver-dri-drivers xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so xserver-gallium-drivers xorg,llvmrt
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 xserver-gallium-drivers xorg,llvmrt
+./usr/X11R7/lib/modules/dri/r600_dri.so xserver-xf86-video-radeon-drivers xorg,llvmrt
+./usr/X11R7/lib/modules/dri/r600_dri.so.0 xserver-xf86-video-radeon-drivers xorg,llvmrt
+./usr/X11R7/lib/modules/dri/radeon_dri.so xserver-xf86-video-radeon-drivers xorg
+./usr/X11R7/lib/modules/dri/radeon_dri.so.0 xserver-xf86-video-radeon-drivers xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so xserver-xf86-input-keyboard-drivers xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 xserver-xf86-input-keyboard-drivers xorg
./usr/X11R7/lib/modules/drivers/modesetting_drv.so xserver-modesetting-drivers xorg
./usr/X11R7/lib/modules/drivers/modesetting_drv.so.0 xserver-modesetting-drivers xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so xserver-xf86-input-mouse-drivers xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 xserver-xf86-input-mouse-drivers xorg
+./usr/X11R7/lib/modules/drivers/nouveau_drv.so xserver-xf86-video-nouveau-drivers xorg
+./usr/X11R7/lib/modules/drivers/nouveau_drv.so.1 xserver-xf86-video-nouveau-drivers xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv.so xserver-xf86-video-radeon-kms-drivers xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv.so.19 xserver-xf86-video-radeon-kms-drivers xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so xserver-xf86-video-radeon-kms-drivers xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 xserver-xf86-video-radeon-kms-drivers xorg
./usr/X11R7/lib/modules/drivers/void_drv.so xserver-obsolete obsolete
./usr/X11R7/lib/modules/drivers/void_drv.so.1 xserver-obsolete obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so xserver-xf86-input-ws-drivers xorg
@@ -103,9 +119,12 @@
./usr/X11R7/man/html1/cvt.html xserver-xorg-server-htmlman html,xorg
./usr/X11R7/man/html1/gtf.html xserver-xorg-server-htmlman html,xorg
./usr/X11R7/man/html4/exa.html xserver-xf86-video-exa-htmlman html,xorg
+./usr/X11R7/man/html4/evbarm/radeon.html xserver-xf86-video-radeon-htmlman html,xorg
./usr/X11R7/man/html4/kbd.html xserver-xf86-input-keyboard-htmlman html,xorg
./usr/X11R7/man/html4/modesetting.html xserver-modesetting-htmlman html,xorg
./usr/X11R7/man/html4/mousedrv.html xserver-xf86-input-mouse-htmlman html,xorg
+./usr/X11R7/man/html4/nouveau.html xserver-xf86-video-nouveau-htmlman html,xorg
+./usr/X11R7/man/html4/radeon.html xserver-xf86-video-radeon-kms-htmlman html,xorg
./usr/X11R7/man/html4/void.html xserver-obsolete obsolete
./usr/X11R7/man/html4/ws.html xserver-xf86-input-ws-htmlman html,xorg
./usr/X11R7/man/html4/wsfb.html xserver-xf86-video-wsfb-htmlman html,xorg
@@ -117,8 +136,11 @@
./usr/X11R7/man/man4/kbd.4 xserver-xf86-input-keyboard-man .man,xorg
./usr/X11R7/man/man4/modesetting.4 xserver-modesetting-man .man,xorg
./usr/X11R7/man/man4/mousedrv.4 xserver-xf86-input-mouse-man .man,xorg
+./usr/X11R7/man/man4/nouveau.4 xserver-xf86-video-nouveau-man .man,xorg
+./usr/X11R7/man/man4/radeon.4 xserver-xf86-video-radeon-kms-man .man,xorg
./usr/X11R7/man/man4/void.4 xserver-obsolete obsolete
./usr/X11R7/man/man4/ws.4 xserver-xf86-input-ws-man .man,xorg
./usr/X11R7/man/man4/wsfb.4 xserver-xf86-video-wsfb-man .man,xorg
+./usr/X11R7/man/man4/evbarm/radeon.4 xserver-xf86-video-radeon-man .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 xserver-xorg-server-man .man,xorg
./usr/X11R7/share/aclocal/xorg-server.m4 xserver-xorg-server-share xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.25 src/etc/mtree/NetBSD.dist.Xorg:1.26
--- src/etc/mtree/NetBSD.dist.Xorg:1.25 Tue Apr 16 21:20:50 2019
+++ src/etc/mtree/NetBSD.dist.Xorg Sun Jan 19 00:58:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.25 2019/04/16 21:20:50 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.26 2020/01/19 00:58:14 jmcneill Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -158,18 +158,21 @@
./usr/X11R7/man/cat1
./usr/X11R7/man/cat3
./usr/X11R7/man/cat4
+./usr/X11R7/man/cat4/evbarm
./usr/X11R7/man/cat4/x86
./usr/X11R7/man/cat5
./usr/X11R7/man/cat7
./usr/X11R7/man/html1
./usr/X11R7/man/html3
./usr/X11R7/man/html4
+./usr/X11R7/man/html4/evbarm
./usr/X11R7/man/html4/x86
./usr/X11R7/man/html5
./usr/X11R7/man/html7
./usr/X11R7/man/man1
./usr/X11R7/man/man3
./usr/X11R7/man/man4
+./usr/X11R7/man/man4/evbarm
./usr/X11R7/man/man4/x86
./usr/X11R7/man/man5
./usr/X11R7/man/man7
Index: src/external/apache2/llvm/librt/Makefile
diff -u src/external/apache2/llvm/librt/Makefile:1.2 src/external/apache2/llvm/librt/Makefile:1.3
--- src/external/apache2/llvm/librt/Makefile:1.2 Mon Nov 18 22:26:14 2019
+++ src/external/apache2/llvm/librt/Makefile Sun Jan 19 00:58:14 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2019/11/18 22:26:14 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/19 00:58:14 jmcneill Exp $
.include <bsd.own.mk>
BUILD_RADEON=0
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ ${MACHINE} == "evbarm"
BUILD_RADEON=1
.endif
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.50 src/external/mit/xorg/lib/Makefile:1.51
--- src/external/mit/xorg/lib/Makefile:1.50 Fri May 31 11:13:27 2019
+++ src/external/mit/xorg/lib/Makefile Sun Jan 19 00:58:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2019/05/31 11:13:27 maya Exp $
+# $NetBSD: Makefile,v 1.51 2020/01/19 00:58:14 jmcneill Exp $
# build libraries for xorg
@@ -9,10 +9,10 @@
SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \
libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=libdrm_intel libdrm_amdgpu
+SUBDIR+=libdrm_intel
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
-SUBDIR+=libdrm_nouveau
+SUBDIR+=libdrm_amdgpu libdrm_nouveau
.endif
SUBDIR+=libdrm_radeon pixman
.if !defined(MLIBDIR)
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.34 src/external/mit/xorg/lib/dri/Makefile:1.35
--- src/external/mit/xorg/lib/dri/Makefile:1.34 Mon Nov 11 22:45:26 2019
+++ src/external/mit/xorg/lib/dri/Makefile Sun Jan 19 00:58:14 2020
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.34 2019/11/11 22:45:26 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2020/01/19 00:58:14 jmcneill Exp $
# Link the mesa_dri_drivers mega driver.
.include <bsd.own.mk>
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ ${MACHINE} == "evbarm"
LIBISMODULE= yes
LIBISCXX= yes
@@ -32,9 +33,9 @@ CPPFLAGS.brw_disk_cache.c+= -march=i586
#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
-# We don't actually build this on non-x86 at all, currently.
+# We don't actually build this on non-x86/non-evbarm at all, currently.
# The following if statements are not effective since we only
-# get here for x86
+# get here for x86 and evbarm
.if ${MACHINE_ARCH} == "alpha"
DRIVERS= r200 radeon
.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
@@ -45,6 +46,8 @@ DRIVERS= r200 radeon
DRIVERS= i915 i965 r200 radeon
.elif ${MACHINE} == "prep" || ${MACHINE} == "bebox"
DRIVERS= r200 radeon
+.elif ${MACHINE} == "evbarm"
+DRIVERS= r200 radeon
.endif
DRI_SUBDIRS= ${DRIVERS}
@@ -469,7 +472,8 @@ FILES= drirc
.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
.include <bsd.x11.mk>
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ ${MACHINE} == "evbarm"
LIBDIR= ${X11USRLIBDIR}/modules/dri
CWARNFLAGS.clang+= -Wno-error=initializer-overrides -Wno-error=switch \
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.40 src/external/mit/xorg/lib/gallium/Makefile:1.41
--- src/external/mit/xorg/lib/gallium/Makefile:1.40 Wed Nov 20 06:23:31 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Jan 19 00:58:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/11/20 06:23:31 martin Exp $
+# $NetBSD: Makefile,v 1.41 2020/01/19 00:58:14 jmcneill Exp $
# Link the gallium mega driver.
@@ -94,12 +94,12 @@ BUILD_LLVMPIPE=0
BUILD_I915=0
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BUILD_I915=1
-. if ${MKLLVMRT} != "no"
-BUILD_RADEON=1
-. endif
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
BUILD_NOUVEAU=1
+. if ${MKLLVMRT} != "no"
+BUILD_RADEON=1
+. endif
BUILD_VDPAU=1
.endif
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.97 src/external/mit/xorg/server/drivers/Makefile:1.98
--- src/external/mit/xorg/server/drivers/Makefile:1.97 Thu Jan 10 23:10:23 2019
+++ src/external/mit/xorg/server/drivers/Makefile Sun Jan 19 00:58:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2019/01/10 23:10:23 uwe Exp $
+# $NetBSD: Makefile,v 1.98 2020/01/19 00:58:14 jmcneill Exp $
.include <bsd.own.mk>
@@ -181,6 +181,9 @@ SUBDIR+= \
.if ${MACHINE} == "evbarm"
SUBDIR+= \
${MODE_SETTING} \
+ xf86-video-nouveau \
+ xf86-video-radeon \
+ xf86-video-radeon-kms \
xf86-video-wsfb
.endif # ${MACHINE} == "evbarm"
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.21 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.22
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.21 Tue Jan 1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Sun Jan 19 00:58:15 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2019/01/01 00:37:06 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2020/01/19 00:58:15 jmcneill Exp $
.include <bsd.own.mk>
DRIVER= xf86-video-ati
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ ${MACHINE} == "evbarm"
DRIVER_NAME= radeon_drv_old
.else
DRIVER_NAME= radeon_drv
@@ -27,7 +28,8 @@ CPPFLAGS+= -DUSE_XAA
.if ${X11DRI} != "no"
# XXX
-. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ ${MACHINE} == "evbarm"
SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
CPPFLAGS+= -DXF86DRM_MODE
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.9 Sun Mar 10 02:29:53 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun Jan 19 00:58:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/03/10 02:29:53 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2020/01/19 00:58:15 jmcneill Exp $
.include <bsd.own.mk>
@@ -46,7 +46,12 @@ SRCS= radeon_accel.c radeon_video.c \
$(SRCS.GLAMOR)
MAN= radeon.4
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
MANSUBDIR= /x86
+.else
+MANSUBDIR= /${MACHINE}
+.endif
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
