xserver: Branch 'master'

[GitLab Mirror]

 Xext/meson.build      |    1 -
 hw/xfree86/sdksyms.sh |    4 ----
 2 files changed, 5 deletions(-)

New commits:
commit 3f469acb96a9e6dcd83d8538df316e915dd9353c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Feb 19 19:58:52 2025 +0100

    panoramix: don't install panoramiX.h and panoramiXsrv.h
    
    Not used by any drivers/modules, so no need to keep them public.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1815>

diff --git a/Xext/meson.build b/Xext/meson.build
index 457c7ef2c..9913cc30e 100644
--- a/Xext/meson.build
+++ b/Xext/meson.build
@@ -44,7 +44,6 @@ endif
 
 if build_xinerama
     srcs_xext += ['panoramiX.c', 'panoramiXprocs.c', 'panoramiXSwap.c']
-    hdrs_xext += ['panoramiX.h', 'panoramiXsrv.h']
 endif
 
 if build_xsecurity
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 4176115e6..74ffd8994 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -58,10 +58,6 @@ cat > sdksyms.c << EOF
 #include "shmint.h"
 #endif
 #include "syncsdk.h"
-#ifdef XINERAMA
-# include "panoramiXsrv.h"
-# include "panoramiX.h"
-#endif
 
 /* glx/Makefile.am */
 #ifdef GLX