From 69d57bcf52da72cf0a4580ccb791d810c6ed0657 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 12 Feb 2026 13:55:23 +0100 Subject: [PATCH] Xext: move over public SDK headers to include/ Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/meson.build | 10 ---------- Xext/shm.c | 2 +- Xext/shm_priv.h | 2 +- Xext/sync.c | 2 +- Xext/xvdisp.c | 11 +++-------- Xext/xvdix_priv.h | 2 +- Xext/xvmc.c | 2 +- dri3/dri3_request.c | 2 +- dri3/dri3_screen.c | 10 ++++++---- exa/exa_priv.h | 6 +++--- fb/fboverlay.c | 2 +- hw/kdrive/src/kxv.h | 4 ++-- hw/xfree86/sdksyms.sh | 2 +- hw/xquartz/darwin.c | 6 ++---- include/meson.build | 9 ++++++++- include/misync.h | 2 ++ {Xext => include}/shmint.h | 1 + {Xext => include}/syncsdk.h | 0 {Xext => include}/xvdix.h | 0 {Xext => include}/xvmcext.h | 0 mi/miscrinit.c | 6 ++---- present/present_priv.h | 2 +- 22 files changed, 38 insertions(+), 45 deletions(-) rename {Xext => include}/shmint.h (99%) rename {Xext => include}/syncsdk.h (100%) rename {Xext => include}/xvdix.h (100%) rename {Xext => include}/xvmcext.h (100%) diff --git a/Xext/meson.build b/Xext/meson.build index 7fec3ab2b3..c7d1636750 100644 --- a/Xext/meson.build +++ b/Xext/meson.build @@ -9,17 +9,12 @@ srcs_xext = [ 'xtest.c', ] -hdrs_xext = [ - 'syncsdk.h', -] - if build_dpms srcs_xext += 'dpms.c' endif if build_mitshm srcs_xext += 'shm.c' - hdrs_xext += ['shmint.h'] endif if build_hashtable @@ -52,7 +47,6 @@ endif if build_xv srcs_xext += ['xvmain.c', 'xvdisp.c', 'xvmc.c'] - hdrs_xext += ['xvdix.h', 'xvmcext.h'] endif libxserver_xext = static_library('xserver_xext', @@ -61,9 +55,5 @@ libxserver_xext = static_library('xserver_xext', dependencies: common_dep, ) -if build_xorg - install_data(hdrs_xext, install_dir: xorgsdkdir) -endif - subdir('damage') subdir('dri2') diff --git a/Xext/shm.c b/Xext/shm.c index 2b3e153a70..46136ac7d4 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -48,6 +48,7 @@ in this Software without prior written authorization from The Open Group. #include "dix/screen_hooks_priv.h" #include "dix/screenint_priv.h" #include "dix/window_priv.h" +#include "include/shmint.h" #include "miext/extinit_priv.h" #include "os/auth.h" #include "os/busfault.h" @@ -68,7 +69,6 @@ in this Software without prior written authorization from The Open Group. #include "gcstruct.h" #include "extnsionst.h" #include "servermd.h" -#include "shmint.h" #include "xace.h" #include "protocol-versions.h" diff --git a/Xext/shm_priv.h b/Xext/shm_priv.h index ef6bf08459..5291487b8f 100644 --- a/Xext/shm_priv.h +++ b/Xext/shm_priv.h @@ -7,7 +7,7 @@ #define _XSERVER_XEXT_SHM_PRIV_H #include "include/resource.h" -#include "Xext/shmint.h" +#include "include/shmint.h" typedef struct _ShmDesc { struct _ShmDesc *next; diff --git a/Xext/sync.c b/Xext/sync.c index f97ac04ce6..b4552a04dc 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -61,6 +61,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "dix/dix_priv.h" #include "dix/request_priv.h" #include "dix/screenint_priv.h" +#include "include/syncsdk.h" #include "miext/extinit_priv.h" #include "os/bug_priv.h" #include "os/osdep.h" @@ -72,7 +73,6 @@ PERFORMANCE OF THIS SOFTWARE. #include "pixmapstr.h" #include "resource.h" #include "syncsrv.h" -#include "syncsdk.h" #include "protocol-versions.h" #include "inputstr.h" #include "misync_priv.h" diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index c4b2f8d338..ad604af958 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -29,11 +29,14 @@ SOFTWARE. #include #include #include +#include #include "dix/dix_priv.h" #include "dix/rpcbuf_priv.h" #include "dix/request_priv.h" #include "dix/screenint_priv.h" +#include "include/shmint.h" +#include "include/xvmcext.h" #include "Xext/panoramiX.h" #include "Xext/panoramiXsrv.h" #include "Xext/shm_priv.h" @@ -47,10 +50,6 @@ SOFTWARE. #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#ifdef CONFIG_MITSHM -#include -#include "shmint.h" -#endif #include "xvdisp.h" @@ -824,10 +823,6 @@ ProcXvShmPutImage(ClientPtr client) #endif /* CONFIG_MITSHM */ } -#ifdef XvMCExtension -#include "xvmcext.h" -#endif - __size_assert(int, sizeof(INT32)); static int diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h index db9e66c7a5..919b07b7d4 100644 --- a/Xext/xvdix_priv.h +++ b/Xext/xvdix_priv.h @@ -10,7 +10,7 @@ #include "include/pixmap.h" #include "include/regionstr.h" -#include "Xext/xvdix.h" +#include "include/xvdix.h" #define VALIDATE_XV_PORT(portID, pPort, mode)\ {\ diff --git a/Xext/xvmc.c b/Xext/xvmc.c index c49a11e060..1a45b61986 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -12,6 +12,7 @@ #include "dix/dix_priv.h" #include "dix/request_priv.h" #include "dix/screen_hooks_priv.h" +#include "include/xvmcext.h" #include "miext/extinit_priv.h" #include "Xext/xvdix_priv.h" @@ -22,7 +23,6 @@ #include "scrnintstr.h" #include "extnsionst.h" #include "servermd.h" -#include "xvmcext.h" #define SERVER_XVMC_MAJOR_VERSION 1 #define SERVER_XVMC_MINOR_VERSION 1 diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c index 798df9af34..46f058bba5 100644 --- a/dri3/dri3_request.c +++ b/dri3/dri3_request.c @@ -26,12 +26,12 @@ #include "dix/dix_priv.h" #include "dix/request_priv.h" #include "dix/screenint_priv.h" +#include "include/syncsdk.h" #include "os/client_priv.h" #include "dri3_priv.h" #include #include -#include "../Xext/syncsdk.h" #include #include #include "randrstr_priv.h" diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c index 9ae562e712..93a2fbea20 100644 --- a/dri3/dri3_screen.c +++ b/dri3/dri3_screen.c @@ -21,14 +21,16 @@ */ #include +#include +#include +#include + +#include "include/syncsdk.h" + #include "dri3_priv.h" -#include #include #include #include -#include -#include -#include int dri3_open(ClientPtr client, ScreenPtr screen, RRProviderPtr provider, int *fd) diff --git a/exa/exa_priv.h b/exa/exa_priv.h index a127910259..f9c22fd6c7 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -30,9 +30,9 @@ #include #include -#ifdef CONFIG_MITSHM -#include "shmint.h" -#endif /* CONFIG_MITSHM */ + +#include "include/shmint.h" + #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/fb/fboverlay.c b/fb/fboverlay.c index c0ccbb50b6..54fd63e50f 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -26,11 +26,11 @@ #include +#include "include/shmint.h" #include "mi/mi_priv.h" #include "fb.h" #include "fboverlay.h" -#include "shmint.h" static DevPrivateKeyRec fbOverlayScreenPrivateKeyRec; diff --git a/hw/kdrive/src/kxv.h b/hw/kdrive/src/kxv.h index 9c5975072e..04c9fc3171 100644 --- a/hw/kdrive/src/kxv.h +++ b/hw/kdrive/src/kxv.h @@ -38,6 +38,8 @@ of the copyright holder. #ifndef _XVDIX_H_ #define _XVDIX_H_ +#include "include/xvdix.h" + #include "scrnintstr.h" #include "regionstr.h" #include "windowstr.h" @@ -47,8 +49,6 @@ of the copyright holder. #include "gcstruct.h" #include "dixstruct.h" -#include "../../Xext/xvdix.h" - #define VIDEO_OVERLAID_IMAGES 0x00000004 #define VIDEO_OVERLAID_STILLS 0x00000008 #define VIDEO_CLIP_TO_VIEWPORT 0x00000010 diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index 22b698529f..cb0368fb66 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -56,7 +56,7 @@ cat > sdksyms.c << EOF #ifdef CONFIG_MITSHM #include "shmint.h" #endif /* CONFIG_MITSHM */ -#include "syncsdk.h" +#include "include/syncsdk.h" /* glx/Makefile.am */ #ifdef GLX diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 28c588e066..58370ff305 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -74,13 +74,11 @@ #define NO_CFPLUGIN #include +#include "include/shmint.h" + #include "input_priv.h" #include "screenint_priv.h" -#ifdef CONFIG_MITSHM -#include "shmint.h" -#endif /* CONFIG_MITSHM */ - #include "darwin.h" #include "darwinEvents.h" #include "quartzKeyboard.h" diff --git a/include/meson.build b/include/meson.build index 82584c8ec1..ad3f4b0d02 100644 --- a/include/meson.build +++ b/include/meson.build @@ -495,6 +495,7 @@ if build_xorg 'scrnintstr.h', 'servermd.h', 'shadow.h', + 'syncsdk.h', 'validate.h', 'displaymode.h', 'vndserver.h', @@ -513,13 +514,15 @@ if build_xorg 'xf86str.h', 'xf86Module.h', 'xf86Xinput.h', + 'xf86sbusBus.h', 'xisb.h', 'xkbsrv.h', 'xkbstr.h', 'xkbrules.h', 'xorgVersion.h', 'Xprintf.h', - 'xf86sbusBus.h', + 'xvdix.h', + 'xvmcext.h', 'xserver-properties.h', 'xlibre_ptrtypes.h', ], @@ -533,4 +536,8 @@ if build_xorg if build_xv install_data(['xf86xv.h', 'xf86xvmc.h'], install_dir: xorgsdkdir) endif + + if build_mitshm + install_data(['shmint.h'], install_dir: xorgsdkdir) + endif endif diff --git a/include/misync.h b/include/misync.h index 5956fe8a84..c8f4a3a4e8 100644 --- a/include/misync.h +++ b/include/misync.h @@ -23,6 +23,8 @@ #ifndef _MISYNC_H_ #define _MISYNC_H_ +#include "screenint.h" + typedef struct _SyncObject SyncObject; typedef struct _SyncFence SyncFence; typedef struct _SyncTrigger SyncTrigger; diff --git a/Xext/shmint.h b/include/shmint.h similarity index 99% rename from Xext/shmint.h rename to include/shmint.h index d7fda390ac..1cd8a773c6 100644 --- a/Xext/shmint.h +++ b/include/shmint.h @@ -23,6 +23,7 @@ #ifndef _SHMINT_H_ #define _SHMINT_H_ +#include #include #include "screenint.h" diff --git a/Xext/syncsdk.h b/include/syncsdk.h similarity index 100% rename from Xext/syncsdk.h rename to include/syncsdk.h diff --git a/Xext/xvdix.h b/include/xvdix.h similarity index 100% rename from Xext/xvdix.h rename to include/xvdix.h diff --git a/Xext/xvmcext.h b/include/xvmcext.h similarity index 100% rename from Xext/xvmcext.h rename to include/xvmcext.h diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 61042c8275..df7461e6f6 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -29,7 +29,9 @@ from The Open Group. #include #include +#include +#include "include/shmint.h" #include "mi/mi_priv.h" #include "servermd.h" @@ -38,10 +40,6 @@ from The Open Group. #include "pixmapstr.h" #include "dix.h" #include "miline.h" -#ifdef CONFIG_MITSHM -#include -#include "shmint.h" -#endif /* CONFIG_MITSHM */ /* We use this structure to propagate some information from miScreenInit to * miCreateScreenResources. miScreenInit allocates the structure, fills it diff --git a/present/present_priv.h b/present/present_priv.h index a4855ebddb..790073c994 100644 --- a/present/present_priv.h +++ b/present/present_priv.h @@ -27,13 +27,13 @@ #include #include "include/present.h" +#include "include/syncsdk.h" #include "scrnintstr.h" #include "misc.h" #include "list.h" #include "windowstr.h" #include "dixstruct.h" -#include #include #include #include