From 430d3b62c26715ab85106cc0daa68bed2f8b5f96 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 12 Feb 2026 13:25:18 +0100
Subject: [PATCH] fb: move over public SDK headers to include/

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 fb/fb_priv.h                |  2 +-
 fb/fbpict_priv.h            |  2 +-
 fb/meson.build              | 12 ------------
 glamor/glamor_addtraps.c    |  2 +-
 {fb => include}/fb.h        |  0
 {fb => include}/fboverlay.h |  0
 {fb => include}/fbpict.h    |  0
 {fb => include}/fbrop.h     |  0
 include/meson.build         |  5 +++++
 {fb => include}/wfbrename.h |  0
 10 files changed, 8 insertions(+), 15 deletions(-)
 rename {fb => include}/fb.h (100%)
 rename {fb => include}/fboverlay.h (100%)
 rename {fb => include}/fbpict.h (100%)
 rename {fb => include}/fbrop.h (100%)
 rename {fb => include}/wfbrename.h (100%)

diff --git a/fb/fb_priv.h b/fb/fb_priv.h
index c4990504d0..bc46f4716a 100644
--- a/fb/fb_priv.h
+++ b/fb/fb_priv.h
@@ -7,8 +7,8 @@
 
 #include <X11/Xdefs.h>
 
+#include "include/fb.h"
 #include "include/scrnintstr.h"
-#include "fb/fb.h"
 
 #define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
 
diff --git a/fb/fbpict_priv.h b/fb/fbpict_priv.h
index afeca00aad..8708fe9042 100644
--- a/fb/fbpict_priv.h
+++ b/fb/fbpict_priv.h
@@ -7,7 +7,7 @@
 
 #include <X11/extensions/renderproto.h>
 
-#include "fb/fbpict.h"
+#include "include/fbpict.h"
 #include "render/picture.h"
 
 void fbRasterizeTrapezoid(PicturePtr alpha, xTrapezoid *trap,
diff --git a/fb/meson.build b/fb/meson.build
index b31275a244..cfb4bdcc30 100644
--- a/fb/meson.build
+++ b/fb/meson.build
@@ -29,14 +29,6 @@ srcs_fb = [
 	'fbwindow.c',
 ]
 
-hdrs_fb = [
-	'fb.h',
-	'fboverlay.h',
-	'fbpict.h',
-	'fbrop.h',
-	'wfbrename.h'
-]
-
 libxserver_fb = static_library('xserver_fb',
 	srcs_fb,
 	include_directories: inc,
@@ -54,7 +46,3 @@ libxserver_wfb = static_library('xserver_wfb',
 	pic: true,
 	build_by_default: false,
 )
-
-if build_xorg
-    install_data(hdrs_fb, install_dir: xorgsdkdir)
-endif
diff --git a/glamor/glamor_addtraps.c b/glamor/glamor_addtraps.c
index 2d370c7e38..10e54139f0 100644
--- a/glamor/glamor_addtraps.c
+++ b/glamor/glamor_addtraps.c
@@ -27,7 +27,7 @@
  */
 #include <dix-config.h>
 
-#include "fb/fbpict.h"
+#include "include/fbpict.h"
 
 #include "glamor_priv.h"
 
diff --git a/fb/fb.h b/include/fb.h
similarity index 100%
rename from fb/fb.h
rename to include/fb.h
diff --git a/fb/fboverlay.h b/include/fboverlay.h
similarity index 100%
rename from fb/fboverlay.h
rename to include/fboverlay.h
diff --git a/fb/fbpict.h b/include/fbpict.h
similarity index 100%
rename from fb/fbpict.h
rename to include/fbpict.h
diff --git a/fb/fbrop.h b/include/fbrop.h
similarity index 100%
rename from fb/fbrop.h
rename to include/fbrop.h
diff --git a/include/meson.build b/include/meson.build
index a781f6f815..5673314b7f 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -435,6 +435,11 @@ if build_xorg
             'extension.h',
             'extinit.h',
             'extnsionst.h',
+            'fb.h',
+            'fboverlay.h',
+            'fbpict.h',
+            'fbrop.h',
+            'wfbrename.h',
             'fd_notify.h',
             'fourcc.h',
             'gc.h',
diff --git a/fb/wfbrename.h b/include/wfbrename.h
similarity index 100%
rename from fb/wfbrename.h
rename to include/wfbrename.h