Xext: move over public SDK headers to include/

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2026-03-23 23:30:02 +00:00 · 2026-02-12 13:55:23 +01:00
parent 9bd146a391
commit 69d57bcf52
22 changed files with 38 additions and 45 deletions
--- 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')
--- 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"

--- 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;
--- 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"
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -29,11 +29,14 @@ SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>
+#include <X11/extensions/shmproto.h>

 #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 <X11/extensions/shmproto.h>
-#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
--- 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)\
    {\
--- 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
--- 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 <syncsrv.h>
 #include <xace.h>
-#include "../Xext/syncsdk.h"
 #include <protocol-versions.h>
 #include <drm_fourcc.h>
 #include "randrstr_priv.h"
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -21,14 +21,16 @@
 */
 #include <dix-config.h>

+#include <assert.h>
+#include <drm_fourcc.h>
+#include <unistd.h>
+
+#include "include/syncsdk.h"
+
 #include "dri3_priv.h"
-#include <syncsdk.h>
 #include <misync.h>
 #include <misyncshm.h>
 #include <randrstr.h>
-#include <drm_fourcc.h>
-#include <unistd.h>
-#include <assert.h>

 int
 dri3_open(ClientPtr client, ScreenPtr screen, RRProviderPtr provider, int *fd)
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -30,9 +30,9 @@

 #include <X11/X.h>
 #include <X11/Xproto.h>
-#ifdef CONFIG_MITSHM
-#include "shmint.h"
-#endif /* CONFIG_MITSHM */
+
+#include "include/shmint.h"
+
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -26,11 +26,11 @@

 #include <stdlib.h>

+#include "include/shmint.h"
 #include "mi/mi_priv.h"

 #include "fb.h"
 #include "fboverlay.h"
-#include "shmint.h"

 static DevPrivateKeyRec fbOverlayScreenPrivateKeyRec;

--- 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
--- 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
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -74,13 +74,11 @@
 #define NO_CFPLUGIN
 #include <IOKit/hidsystem/IOHIDLib.h>

+#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"
--- 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
--- 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;
--- a/include/shmint.h
+++ b/include/shmint.h
@@ -23,6 +23,7 @@
 #ifndef _SHMINT_H_
 #define _SHMINT_H_

+#include <X11/Xmd.h>
 #include <X11/extensions/shmproto.h>

 #include "screenint.h"
--- a/include/syncsdk.h
+++ b/include/syncsdk.h
--- a/include/xvdix.h
+++ b/include/xvdix.h
--- a/include/xvmcext.h
+++ b/include/xvmcext.h
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -29,7 +29,9 @@ from The Open Group.
 #include <dix-config.h>

 #include <X11/X.h>
+#include <X11/extensions/shm.h>

+#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 <X11/extensions/shm.h>
-#include "shmint.h"
-#endif /* CONFIG_MITSHM */

 /* We use this structure to propagate some information from miScreenInit to
 * miCreateScreenResources.  miScreenInit allocates the structure, fills it
--- a/present/present_priv.h
+++ b/present/present_priv.h
@@ -27,13 +27,13 @@
 #include <X11/Xmd.h>

 #include "include/present.h"
+#include "include/syncsdk.h"

 #include "scrnintstr.h"
 #include "misc.h"
 #include "list.h"
 #include "windowstr.h"
 #include "dixstruct.h"
-#include <syncsdk.h>
 #include <syncsrv.h>
 #include <xfixes.h>
 #include <randrstr.h>