fb: move over public SDK headers to include/

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

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)))
 

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,

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

glamor/glamor_addtraps.c

@@ -27,7 +27,7 @@
  */
 #include <dix-config.h>
 
-#include "fb/fbpict.h"
+#include "include/fbpict.h"
 
 #include "glamor_priv.h"
 

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',