From 90003b42b663b12b41e5682cb9d3ddd825eab22c Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 19 May 2025 17:43:24 +0200
Subject: [PATCH] xfree86: drop xf86VGAarbiter.h

It doesn't serve any practical purpose anymore and also isn't included
by any external driver, thus also no need to keep it in SDK.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/meson.build           |  1 -
 hw/xfree86/common/xf86Init.c            |  3 ---
 hw/xfree86/common/xf86VGAarbiter.h      | 33 -------------------------
 hw/xfree86/common/xf86VGAarbiter_priv.h |  2 +-
 hw/xfree86/sdksyms.sh                   |  3 ---
 5 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 hw/xfree86/common/xf86VGAarbiter.h

diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index cbb1b21dd..91f0bed1f 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -39,7 +39,6 @@ xorg_sdk_headers = [
     'xisb.h',
     'xorgVersion.h',
     'xf86sbusBus.h',
-    'xf86VGAarbiter.h',
     'xf86Optionstr.h',
     'xf86platformBus.h',
     'xaarop.h',
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2f85c7941..2c7de0303 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -84,9 +84,6 @@
 #include "picturestr.h"
 #include "randrstr.h"
 #include "xf86Bus.h"
-#ifdef XSERVER_LIBPCIACCESS
-#include "xf86VGAarbiter.h"
-#endif
 #include "globals.h"
 #include "xserver-properties.h"
 
diff --git a/hw/xfree86/common/xf86VGAarbiter.h b/hw/xfree86/common/xf86VGAarbiter.h
deleted file mode 100644
index e3530f730..000000000
--- a/hw/xfree86/common/xf86VGAarbiter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2009 Tiago Vignatti
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __XF86VGAARBITER_H
-#define __XF86VGAARBITER_H
-
-#include "screenint.h"
-#include "misc.h"
-#include "xf86.h"
-
-#endif                          /* __XF86VGAARBITER_H */
diff --git a/hw/xfree86/common/xf86VGAarbiter_priv.h b/hw/xfree86/common/xf86VGAarbiter_priv.h
index 9b556ccec..d6dd9ccff 100644
--- a/hw/xfree86/common/xf86VGAarbiter_priv.h
+++ b/hw/xfree86/common/xf86VGAarbiter_priv.h
@@ -7,7 +7,7 @@
 
 #include <X11/Xdefs.h>
 
-#include "xf86VGAarbiter.h"
+#include "xf86str.h"
 
 #ifdef XSERVER_LIBPCIACCESS
 
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index ca5f11e74..5d24b9108 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -122,9 +122,6 @@ cat > sdksyms.c << EOF
 #include "xf86.h"
 #include "xf86Module.h"
 #include "xf86Opt.h"
-#ifdef XSERVER_LIBPCIACCESS
- #include "xf86VGAarbiter.h"
-#endif
 #include "xf86Priv.h"
 #include "xf86Privstr.h"
 #include "xf86cmap.h"