From af0de5a0f4cd3bbce358d6a8cd88e2017e12d31c Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 13 Feb 2026 13:10:31 +0100
Subject: [PATCH] xfree86: make xf86Sbus.h private

This header isn't actually included by any drivers (not even the sun* ones),
neither does it have any _X_EXPORT'ed symbols, nor structs that a driver
could use. Not relevant at all for proprietary Nvidia drivers, because their
cards never worked on Sbus.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86Configure.c                            | 2 +-
 hw/xfree86/common/xf86sbusBus.c                              | 2 +-
 hw/xfree86/os-support/bus/Sbus.c                             | 2 +-
 .../xf86Sbus.h => hw/xfree86/os-support/bus/xf86Sbus_priv.h  | 0
 hw/xfree86/sdksyms.sh                                        | 4 ----
 include/meson.build                                          | 5 -----
 6 files changed, 3 insertions(+), 12 deletions(-)
 rename include/xf86Sbus.h => hw/xfree86/os-support/bus/xf86Sbus_priv.h (100%)

diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 9d1d333fb9..42e4880d64 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -41,7 +41,7 @@
 #include "xf86pciBus.h"
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
 #include "xf86Bus.h"
-#include "xf86Sbus.h"
+#include "xf86Sbus_priv.h"
 #endif
 #include "misc.h"
 #include "loaderProcs.h"
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 1fa9a3f9fc..a0c37c634b 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -35,7 +35,7 @@
 #include "xf86Bus.h"
 
 #include "xf86sbusBus_priv.h"
-#include "xf86Sbus.h"
+#include "xf86Sbus_priv.h"
 
 static int xf86nSbusInfo;
 
diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index 95c57b5e22..7ca27ba316 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -36,7 +36,7 @@
 #include "xf86_OSlib.h"
 
 #include "xf86sbusBus_priv.h"
-#include "xf86Sbus.h"
+#include "xf86Sbus_priv.h"
 
 static int promRootNode;
 
diff --git a/include/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus_priv.h
similarity index 100%
rename from include/xf86Sbus.h
rename to hw/xfree86/os-support/bus/xf86Sbus_priv.h
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index b23dcc9d0e..9650c6f354 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -164,10 +164,6 @@ cat > sdksyms.c << EOF
 #ifdef XSERVER_LIBPCIACCESS
 # include "xf86Pci.h"
 #endif
-#if defined(__sparc__) || defined(__sparc)
-# include "xf86Sbus.h"
-#endif
-
 
 /* hw/xfree86/parser/Makefile.am */
 #include "xf86Parser.h"
diff --git a/include/meson.build b/include/meson.build
index 775364cf13..f758bdcda8 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -523,7 +523,6 @@ if build_xorg_sdk
             'xf86Module.h',
             'xf86Xinput.h',
             'xf86sbusBus.h',
-            'xf86Sbus.h',
             'xf86Pci.h',
             'xf86_OSlib.h',
             'xf86_OSproc.h',
@@ -556,10 +555,6 @@ if build_xorg_sdk
         install_data(['shmint.h'], install_dir: xorgsdkdir)
     endif
 
-    if get_option('pciaccess') and host_machine.cpu_family() in ['sparc', 'sparc64']
-        install_data('xf86Sbus.h', install_dir: xorgsdkdir)
-    endif
-
     if int10 != 'false'
         install_data(['xf86int10.h', 'vbe.h', 'vbeModes.h'], install_dir: xorgsdkdir)
     endif