modular-xorg-server: some minor build fixes for NetBSD/alpha

3 files changed, 39 insertions, 1 deletions

diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index eaf2fc16a32..df6deca569f 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.110 2021/07/17 15:58:02 wiz Exp $
+$NetBSD: distinfo,v 1.111 2021/07/21 21:50:29 tnn Exp $
 
 SHA1 (xorg-server-1.20.12.tar.xz) = 2ff90fdccfe285e03ebb4805067bcdae557861ea
 RMD160 (xorg-server-1.20.12.tar.xz) = 04c946f6243ebb0d96f0ab4a9c53b982d2285a71
@@ -9,11 +9,13 @@ SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
+SHA1 (patch-hw_xfree86_os-support_bsd_alpha__video.c) = deb410b82c461ce36c15651795bf62370a56d5a4
 SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
+SHA1 (patch-hw_xfree86_os-support_bus_bsd__pci.c) = 62b410e1777c7bb95386b8510b3738fff5e088f1
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_alpha__video.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_alpha__video.c
new file mode 100644
index 00000000000..b98476a200e
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_alpha__video.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-hw_xfree86_os-support_bsd_alpha__video.c,v 1.1 2021/07/21 21:50:29 tnn Exp $
+
+Fix build on NetBSD/alpha. From xsrc.
+
+--- hw/xfree86/os-support/bsd/alpha_video.c.orig	2021-07-08 19:22:18.000000000 +0000
++++ hw/xfree86/os-support/bsd/alpha_video.c
+@@ -34,6 +34,9 @@
+ #include <sys/param.h>
+ #ifndef __NetBSD__
+ #include <sys/sysctl.h>
++#else
++#include <machine/sysarch.h>
++#include <machine/pio.h>
+ #endif
+ 
+ #include "xf86_OSlib.h"
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_bsd__pci.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_bsd__pci.c
new file mode 100644
index 00000000000..a8b80453270
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_bsd__pci.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-hw_xfree86_os-support_bus_bsd__pci.c,v 1.1 2021/07/21 21:50:29 tnn Exp $
+
+compiler.h needs to go after xf86.h so that CARD8 is defined
+at that point. Fixes build on NetBSD/alpha.
+But probabiy this file shouldn't be compiled at all.
+
+--- hw/xfree86/os-support/bus/bsd_pci.c.orig	2021-07-08 19:22:18.000000000 +0000
++++ hw/xfree86/os-support/bus/bsd_pci.c
+@@ -40,10 +40,10 @@
+ #endif
+ 
+ #include <stdio.h>
+-#include "compiler.h"
+ #include "xf86.h"
+ #include "xf86Priv.h"
+ #include "xf86_OSlib.h"
++#include "compiler.h"
+ #include "Pci.h"
+ 
+ #include "pciaccess.h"