From 45d2ba92d3f8ae07afeff23fee1f521938dd56fc Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 12 Feb 2026 18:45:09 +0100 Subject: [PATCH] xfree86: ddc: move public SDK headers to include/ Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/common/xf86Helper.c | 2 +- hw/xfree86/common/xf86Init.c | 2 +- hw/xfree86/common/xf86Mode.c | 2 +- hw/xfree86/common/xf86RandR.c | 2 +- hw/xfree86/ddc/ddc.c | 2 +- hw/xfree86/ddc/edid_priv.h | 2 +- hw/xfree86/ddc/meson.build | 2 -- hw/xfree86/ddc/xf86DDC_priv.h | 2 +- hw/xfree86/drivers/video/modesetting/driver.c | 2 +- hw/xfree86/modes/xf86Cursors.c | 10 ++++++---- hw/xfree86/modes/xf86DiDGA.c | 3 ++- hw/xfree86/modes/xf86RandR12.c | 2 +- hw/xfree86/modes/xf86Rotate.c | 2 +- {hw/xfree86/ddc => include}/edid.h | 0 include/meson.build | 2 ++ {hw/xfree86/ddc => include}/xf86DDC.h | 0 16 files changed, 20 insertions(+), 17 deletions(-) rename {hw/xfree86/ddc => include}/edid.h (100%) rename {hw/xfree86/ddc => include}/xf86DDC.h (100%) diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 6f5c464d7..c402ee1b1 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -41,6 +41,7 @@ #include "dix/dix_priv.h" #include "dix/input_priv.h" #include "include/extinit.h" +#include "include/xf86DDC.h" #include "mi/mi_priv.h" #include "os/log_priv.h" #include "os/osdep.h" @@ -57,7 +58,6 @@ #include "xf86_OSlib.h" #include "micmap.h" #include "xf86Bus.h" -#include "xf86DDC.h" #include "xf86Xinput_priv.h" #include "xf86InPriv.h" #include "xf86Config.h" diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index f770ba6ac..4d503776b 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -52,6 +52,7 @@ #include "config/hotplug_priv.h" #include "dix/input_priv.h" #include "dix/screenint_priv.h" +#include "include/xf86DDC.h" #include "include/xorgVersion.h" #include "mi/mi_priv.h" #include "os/cmdline.h" @@ -78,7 +79,6 @@ #include "xf86cmap.h" #include "mipointer.h" #include "xf86Extensions.h" -#include "xf86DDC.h" #include "xf86Xinput.h" #include "xf86InPriv.h" #include "xf86Crtc.h" diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 313ec6f53..25f2f613a 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -83,6 +83,7 @@ #include +#include "include/edid.h" #include "include/extinit.h" #include "os/log_priv.h" @@ -93,7 +94,6 @@ #include "globals.h" #include "xf86_priv.h" #include "xf86Priv.h" -#include "edid.h" static void printModeRejectMessage(int index, DisplayModePtr p, int status) diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 3f032da57..38d00889c 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -27,13 +27,13 @@ #include "dix/input_priv.h" #include "dix/screen_hooks_priv.h" #include "include/extinit.h" +#include "include/xf86DDC.h" #include "os.h" #include "globals.h" #include "xf86_priv.h" #include "xf86str.h" #include "xf86Priv.h" -#include "xf86DDC.h" #include "mipointer.h" #include #include "inputstr.h" diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c index 7989f72b0..a15ac212f 100644 --- a/hw/xfree86/ddc/ddc.c +++ b/hw/xfree86/ddc/ddc.c @@ -11,12 +11,12 @@ */ #include +#include "include/xf86DDC.h" #include "os/osdep.h" #include "misc.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86DDC.h" #include #include "edid_priv.h" diff --git a/hw/xfree86/ddc/edid_priv.h b/hw/xfree86/ddc/edid_priv.h index 97051c61b..7b904419a 100644 --- a/hw/xfree86/ddc/edid_priv.h +++ b/hw/xfree86/ddc/edid_priv.h @@ -12,7 +12,7 @@ #ifndef _XFREE86_EDID_PRIV_H_ #define _XFREE86_EDID_PRIV_H_ -#include "edid.h" +#include "include/edid.h" /* read complete EDID record */ #define EDID1_LEN 128 diff --git a/hw/xfree86/ddc/meson.build b/hw/xfree86/ddc/meson.build index c9b816f2e..ea99ce9f4 100644 --- a/hw/xfree86/ddc/meson.build +++ b/hw/xfree86/ddc/meson.build @@ -11,5 +11,3 @@ xorg_ddc = static_library('xorg_ddc', dependencies: common_dep, c_args: xorg_c_args, ) - -install_data(['edid.h', 'xf86DDC.h'], install_dir: xorgsdkdir) diff --git a/hw/xfree86/ddc/xf86DDC_priv.h b/hw/xfree86/ddc/xf86DDC_priv.h index 6071bd05e..edf50c552 100644 --- a/hw/xfree86/ddc/xf86DDC_priv.h +++ b/hw/xfree86/ddc/xf86DDC_priv.h @@ -6,7 +6,7 @@ #ifndef _XSERVER_XF86_DDC_PRIV_H #define _XSERVER_XF86_DDC_PRIV_H -#include "xf86DDC.h" +#include "include/xf86DDC.h" #include "edid_priv.h" /* diff --git a/hw/xfree86/drivers/video/modesetting/driver.c b/hw/xfree86/drivers/video/modesetting/driver.c index 63d1a555b..e80813a87 100644 --- a/hw/xfree86/drivers/video/modesetting/driver.c +++ b/hw/xfree86/drivers/video/modesetting/driver.c @@ -43,6 +43,7 @@ #include "config/hotplug_priv.h" #include "dix/dix_priv.h" +#include "include/edid.h" #include "include/xorgVersion.h" #include "mi/mi_priv.h" @@ -55,7 +56,6 @@ #include "mipointrst.h" #include "micmap.h" #include "fb.h" -#include "edid.h" #include "xf86i2c.h" #include "xf86Crtc.h" #include "miscstruct.h" diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index e3c597913..0aad13346 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -27,15 +27,17 @@ #include #include +#include +#include +#include + +#include "include/xf86DDC.h" + #include "xf86.h" -#include "xf86DDC.h" #include "xf86Crtc.h" #include "xf86Modes.h" #include "xf86RandR12.h" #include "xf86CursorPriv.h" -#include "X11/extensions/render.h" -#include "X11/extensions/dpmsconst.h" -#include "X11/Xatom.h" #include "picturestr.h" #include "cursorstr.h" #include "inputstr.h" diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c index a2dabfbca..f0f16239e 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -21,8 +21,9 @@ */ #include +#include "include/xf86DDC.h" + #include "xf86.h" -#include "xf86DDC.h" #include "xf86_OSproc.h" #include "dgaproc.h" #include "dgaproc_priv.h" diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index 3f45aacf7..8fda200cc 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -27,13 +27,13 @@ #include "dix/input_priv.h" #include "dix/screenint_priv.h" #include "include/extinit.h" +#include "include/xf86DDC.h" #include "xf86.h" #include "os.h" #include "globals.h" #include "xf86Modes.h" #include "xf86Priv.h" -#include "xf86DDC.h" #include "mipointer.h" #include "windowstr.h" #include "inputstr.h" diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index de0fbbcd8..74c64afa6 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -30,10 +30,10 @@ #include #include "dix/dix_priv.h" +#include "include/xf86DDC.h" #include "mi/mi_priv.h" #include "xf86.h" -#include "xf86DDC.h" #include "windowstr.h" #include "xf86Crtc.h" #include "xf86Modes.h" diff --git a/hw/xfree86/ddc/edid.h b/include/edid.h similarity index 100% rename from hw/xfree86/ddc/edid.h rename to include/edid.h diff --git a/include/meson.build b/include/meson.build index 59691bd6a..7f0b9823f 100644 --- a/include/meson.build +++ b/include/meson.build @@ -433,6 +433,7 @@ if build_xorg 'dri2.h', 'dri3.h', 'dristruct.h', + 'edid.h', 'events.h', 'exa.h', 'exevents.h', @@ -505,6 +506,7 @@ if build_xorg 'xaarop.h', 'xf86.h', 'xf86cmap.h', + 'xf86DDC.h', 'xf86fbman.h', 'xf86Opt.h', 'xf86Optionstr.h', diff --git a/hw/xfree86/ddc/xf86DDC.h b/include/xf86DDC.h similarity index 100% rename from hw/xfree86/ddc/xf86DDC.h rename to include/xf86DDC.h