From 9bd146a391b388f9421df2df89f8958340a25bd3 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 12 Feb 2026 17:01:47 +0100 Subject: [PATCH] xfree86: dri: move over public SDK headers to include/ Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/dri/dri.c | 6 +++--- hw/xfree86/dri/meson.build | 9 --------- hw/xfree86/dri/xf86dri.c | 6 +++--- hw/xquartz/xpr/appledri.c | 2 +- hw/xquartz/xpr/dri.c | 2 +- hw/xquartz/xpr/driWrap.c | 2 +- hw/xquartz/xpr/dristruct.h | 2 +- hw/xquartz/xpr/xprScreen.c | 2 +- hw/xquartz/xpr/{dri.h => xpr_dri.h} | 0 {hw/xfree86/dri => include}/dri.h | 0 {hw/xfree86/dri => include}/dristruct.h | 2 ++ include/meson.build | 3 +++ {hw/xfree86/dri => include}/sarea.h | 0 13 files changed, 16 insertions(+), 20 deletions(-) rename hw/xquartz/xpr/{dri.h => xpr_dri.h} (100%) rename {hw/xfree86/dri => include}/dri.h (100%) rename {hw/xfree86/dri => include}/dristruct.h (99%) rename {hw/xfree86/dri => include}/sarea.h (100%) diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 54ac64ded4..84b465ab26 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -42,11 +42,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include "dix/dix_priv.h" #include "dix/screen_hooks_priv.h" #include "dix/screenint_priv.h" +#include "include/dristruct.h" #include "include/extinit.h" +#include "include/sarea.h" #include "xf86.h" #include "xf86drm.h" @@ -57,12 +60,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "scrnintstr.h" #include "windowstr.h" #include "servermd.h" -#include #include "swaprep.h" #include "xf86str.h" #include "dri_priv.h" -#include "sarea.h" -#include "dristruct.h" #include "mi.h" #include "mipointer.h" #include "xf86_os_support.h" diff --git a/hw/xfree86/dri/meson.build b/hw/xfree86/dri/meson.build index 53d1e4f26c..aa6354ee27 100644 --- a/hw/xfree86/dri/meson.build +++ b/hw/xfree86/dri/meson.build @@ -12,12 +12,3 @@ xorg_dri = static_library('xorg_dri', ], c_args: xorg_c_args, ) - -install_data( - [ - 'dri.h', - 'sarea.h', - 'dristruct.h', - ], - install_dir: xorgsdkdir, -) diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index c1e9dd7955..f4c398a59f 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -37,10 +37,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include "dix/dix_priv.h" #include "dix/request_priv.h" #include "dix/screenint_priv.h" +#include "include/dristruct.h" +#include "include/sarea.h" #include "xf86.h" #include "misc.h" @@ -49,12 +52,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "cursorstr.h" #include "scrnintstr.h" #include "servermd.h" -#include #include "swaprep.h" #include "xf86str.h" #include "dri_priv.h" -#include "sarea.h" -#include "dristruct.h" #include "xf86drm.h" #include "protocol-versions.h" #include "xf86Extensions.h" diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c index 2ab97ab80c..95196a3ce2 100644 --- a/hw/xquartz/xpr/appledri.c +++ b/hw/xquartz/xpr/appledri.c @@ -54,7 +54,7 @@ #define _APPLEDRI_SERVER_ #include "appledristr.h" #include "swaprep.h" -#include "dri.h" +#include "xpr_dri.h" #include "dristruct.h" #include "xpr.h" #include "x-hash.h" diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index db3c285895..45491d0908 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -58,7 +58,7 @@ #define _APPLEDRI_SERVER_ #include "appledristr.h" #include "swaprep.h" -#include "dri.h" +#include "xpr_dri.h" #include "dristruct.h" #include "mi.h" #include "mipointer.h" diff --git a/hw/xquartz/xpr/driWrap.c b/hw/xquartz/xpr/driWrap.c index 292a0c4882..df0df77bb2 100644 --- a/hw/xquartz/xpr/driWrap.c +++ b/hw/xquartz/xpr/driWrap.c @@ -37,7 +37,7 @@ #include "windowstr.h" #include "dixfontstr.h" #include "driWrap.h" -#include "dri.h" +#include "xpr_dri.h" #include diff --git a/hw/xquartz/xpr/dristruct.h b/hw/xquartz/xpr/dristruct.h index 068e9a253f..a2b8fbaf74 100644 --- a/hw/xquartz/xpr/dristruct.h +++ b/hw/xquartz/xpr/dristruct.h @@ -35,7 +35,7 @@ #ifndef DRI_STRUCT_H #define DRI_STRUCT_H -#include "dri.h" +#include "xpr_dri.h" #include "x-list.h" #define DRI_MAX_DRAWABLES 256 diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index c4839c9023..22f34bea25 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -42,7 +42,7 @@ #include "pseudoramiX.h" #include "darwinEvents.h" #include "rootless.h" -#include "dri.h" +#include "xpr_dri.h" #include "globals.h" #include #include "applewmExt.h" diff --git a/hw/xquartz/xpr/dri.h b/hw/xquartz/xpr/xpr_dri.h similarity index 100% rename from hw/xquartz/xpr/dri.h rename to hw/xquartz/xpr/xpr_dri.h diff --git a/hw/xfree86/dri/dri.h b/include/dri.h similarity index 100% rename from hw/xfree86/dri/dri.h rename to include/dri.h diff --git a/hw/xfree86/dri/dristruct.h b/include/dristruct.h similarity index 99% rename from hw/xfree86/dri/dristruct.h rename to include/dristruct.h index 2543912bd7..67032215f5 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/include/dristruct.h @@ -34,6 +34,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef DRI_STRUCT_H #define DRI_STRUCT_H +#include "dri.h" +#include "sarea.h" #include "xf86drm.h" #include "xf86Crtc.h" diff --git a/include/meson.build b/include/meson.build index 88b208d8a1..82584c8ec1 100644 --- a/include/meson.build +++ b/include/meson.build @@ -429,8 +429,10 @@ if build_xorg 'dixfont.h', 'dixfontstr.h', 'dixstruct.h', + 'dri.h', 'dri2.h', 'dri3.h', + 'dristruct.h', 'events.h', 'exa.h', 'exevents.h', @@ -488,6 +490,7 @@ if build_xorg 'regionstr.h', 'resource.h', 'rgb.h', + 'sarea.h', 'screenint.h', 'scrnintstr.h', 'servermd.h', diff --git a/hw/xfree86/dri/sarea.h b/include/sarea.h similarity index 100% rename from hw/xfree86/dri/sarea.h rename to include/sarea.h