From 63fd3d585fd747ab6e98d8e69bb755082be6eb7b Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 20 Nov 2025 12:13:36 +0100
Subject: [PATCH] [PR #1487] dix: unexport functions from pixmap.h

PR: https://github.com/X11Libre/xserver/pull/1487
---
 Xext/dri2/dri2.c                              |  1 +
 dix/main.c                                    |  1 +
 dix/pixmap.c                                  |  1 +
 dix/pixmap_priv.h                             | 25 +++++++++++++++++++
 hw/xfree86/common/xf86platformBus.c           |  1 +
 .../video/modesetting/drmmode_display.c       |  1 +
 include/pixmap.h                              | 13 ----------
 randr/rrcrtc.c                                |  1 +
 8 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 dix/pixmap_priv.h

diff --git a/Xext/dri2/dri2.c b/Xext/dri2/dri2.c
index 65b90ad0a3..51ede6fd5c 100644
--- a/Xext/dri2/dri2.c
+++ b/Xext/dri2/dri2.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "os/client_priv.h"
 
 #ifdef WITH_LIBDRM
diff --git a/dix/main.c b/dix/main.c
index 8c55f11967..7f458ba073 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -91,6 +91,7 @@ Equipment Corporation.
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
+#include "dix/pixmap_priv.h"
 #include "dix/registry_priv.h"
 #include "dix/screensaver_priv.h"
 #include "dix/selection_priv.h"
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 2b1f9e1864..717fd9b264 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -31,6 +31,7 @@ from The Open Group.
 #include <X11/X.h>
 #include <X11/extensions/render.h>
 
+#include "dix/pixmap_priv.h"
 #include "mi/mi_priv.h"
 
 #include "scrnintstr.h"
diff --git a/dix/pixmap_priv.h b/dix/pixmap_priv.h
new file mode 100644
index 0000000000..d602d71286
--- /dev/null
+++ b/dix/pixmap_priv.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_PIXMAP_PRIV_H
+#define _XSERVER_DIX_PIXMAP_PRIV_H
+
+#include "include/pixmap.h"
+#include "include/regionstr.h"
+#include "include/screenint.h"
+
+Bool PixmapScreenInit(ScreenPtr pScreen);
+
+/* for DRI2 module */ _X_EXPORT
+PixmapPtr PixmapShareToSecondary(PixmapPtr pixmap, ScreenPtr secondary);
+
+/* for DRI2 module */ _X_EXPORT
+void PixmapUnshareSecondaryPixmap(PixmapPtr secondary_pixmap);
+
+/* for modesetting module */ _X_EXPORT
+void PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src,
+                         int x, int y, int dst_x, int dst_y,
+                         RegionPtr dirty_region);
+
+#endif /* _XSERVER_DIX_PIXMAP_PRIV_H */
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index 6ef72c9e8d..3716d0da35 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 
 #include "config/hotplug_priv.h"
+#include "dix/pixmap_priv.h"
 #include "dix/screenint_priv.h"
 #include "randr/randrstr_priv.h"
 #include "os/osdep.h"
diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.c b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
index de07b0231c..03d7f5e63f 100644
--- a/hw/xfree86/drivers/video/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "os/fmt.h"
 #include "os/mathx_priv.h"
 #include "present/present_priv.h"
diff --git a/include/pixmap.h b/include/pixmap.h
index be6df98900..4b294b5c1f 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -103,19 +103,11 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr pScreen,
 
 extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );
 
-extern _X_EXPORT Bool PixmapScreenInit(ScreenPtr /*pScreen */ );
-
 extern _X_EXPORT PixmapPtr AllocatePixmap(ScreenPtr /*pScreen */ ,
                                           int /*pixDataSize */ );
 
 extern _X_EXPORT void FreePixmap(PixmapPtr /*pPixmap */ );
 
-extern _X_EXPORT PixmapPtr
-PixmapShareToSecondary(PixmapPtr pixmap, ScreenPtr secondary);
-
-extern _X_EXPORT void
-PixmapUnshareSecondaryPixmap(PixmapPtr secondary_pixmap);
-
 #define HAS_DIRTYTRACKING_ROTATION 1
 #define HAS_DIRTYTRACKING_DRAWABLE_SRC 1
 extern _X_EXPORT Bool
@@ -132,9 +124,4 @@ PixmapStopDirtyTracking(DrawablePtr src, PixmapPtr slave_dst);
 extern _X_EXPORT Bool
 PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty);
 
-extern _X_EXPORT void
-PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src,
-                    int x, int y, int dst_x, int dst_y,
-                    RegionPtr dirty_region);
-
 #endif                          /* PIXMAP_H */
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index a53c1d3d0b..0e6fa6a83e 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -25,6 +25,7 @@
 #include <X11/Xatom.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
 #include "randr/randrstr_priv.h"