From 0edeb0e34e6ec54b47365d38cc6537f5e7f552ff Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 12 Feb 2026 16:48:35 +0100 Subject: [PATCH] xfree86: vgahw: move over public SDK header to include/ Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/vgahw/meson.build | 2 -- hw/xfree86/vgahw/vgaHW.c | 6 +----- include/meson.build | 1 + {hw/xfree86/vgahw => include}/vgaHW.h | 0 4 files changed, 2 insertions(+), 7 deletions(-) rename {hw/xfree86/vgahw => include}/vgaHW.h (100%) diff --git a/hw/xfree86/vgahw/meson.build b/hw/xfree86/vgahw/meson.build index af50f15cb4..f5ecaeccc6 100644 --- a/hw/xfree86/vgahw/meson.build +++ b/hw/xfree86/vgahw/meson.build @@ -6,5 +6,3 @@ shared_module('vgahw', install: true, install_dir: module_abi_dir, ) - -install_data('vgaHW.h', install_dir: xorgsdkdir) diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index fcd62a24db..3f7fd642d0 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -17,20 +17,16 @@ #include +#include "include/vgaHW.h" #include "os/log_priv.h" #include "misc.h" - #include "xf86_priv.h" #include "xf86_OSproc.h" #include "xf86Opt_priv.h" #include "xf86Priv.h" -#include "vgaHW.h" - #include "compiler.h" - #include "xf86cmap.h" - #include "Pci.h" #ifndef SAVE_FONT1 diff --git a/include/meson.build b/include/meson.build index f8d0c6e81c..90f5fed128 100644 --- a/include/meson.build +++ b/include/meson.build @@ -493,6 +493,7 @@ if build_xorg 'vndserver.h', 'window.h', 'windowstr.h', + 'vgaHW.h', 'xaarop.h', 'xf86.h', 'xf86cmap.h', diff --git a/hw/xfree86/vgahw/vgaHW.h b/include/vgaHW.h similarity index 100% rename from hw/xfree86/vgahw/vgaHW.h rename to include/vgaHW.h