From 25fc1a02f53c24284adbc648ed690d0dc01d8c6a Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 12 Feb 2026 15:05:41 +0100 Subject: [PATCH] render: move over public SDK headers to include/ Signed-off-by: Enrico Weigelt, metux IT consult --- fb/fbpict_priv.h | 2 +- {render => include}/glyphstr.h | 0 include/meson.build | 4 ++++ {render => include}/mipict.h | 0 {render => include}/picture.h | 0 {render => include}/picturestr.h | 0 render/meson.build | 11 ----------- 7 files changed, 5 insertions(+), 12 deletions(-) rename {render => include}/glyphstr.h (100%) rename {render => include}/mipict.h (100%) rename {render => include}/picture.h (100%) rename {render => include}/picturestr.h (100%) diff --git a/fb/fbpict_priv.h b/fb/fbpict_priv.h index 8708fe9042..4092b5a64d 100644 --- a/fb/fbpict_priv.h +++ b/fb/fbpict_priv.h @@ -8,7 +8,7 @@ #include #include "include/fbpict.h" -#include "render/picture.h" +#include "include/picture.h" void fbRasterizeTrapezoid(PicturePtr alpha, xTrapezoid *trap, int x_off, int y_off); diff --git a/render/glyphstr.h b/include/glyphstr.h similarity index 100% rename from render/glyphstr.h rename to include/glyphstr.h diff --git a/include/meson.build b/include/meson.build index 90f5fed128..270c23ef28 100644 --- a/include/meson.build +++ b/include/meson.build @@ -472,6 +472,10 @@ if build_xorg 'opaque.h', 'optionstr.h', 'os.h', + 'glyphstr.h', + 'mipict.h', + 'picture.h', + 'picturestr.h', 'present.h', 'pixmap.h', 'pixmapstr.h', diff --git a/render/mipict.h b/include/mipict.h similarity index 100% rename from render/mipict.h rename to include/mipict.h diff --git a/render/picture.h b/include/picture.h similarity index 100% rename from render/picture.h rename to include/picture.h diff --git a/render/picturestr.h b/include/picturestr.h similarity index 100% rename from render/picturestr.h rename to include/picturestr.h diff --git a/render/meson.build b/render/meson.build index b091d30c65..cdef4d5994 100644 --- a/render/meson.build +++ b/render/meson.build @@ -12,19 +12,8 @@ srcs_render = [ 'render.c', ] -hdrs_render = [ - 'glyphstr.h', - 'mipict.h', - 'picture.h', - 'picturestr.h', -] - libxserver_render = static_library('xserver_render', srcs_render, include_directories: inc, dependencies: common_dep, ) - -if build_xorg - install_data(hdrs_render, install_dir: xorgsdkdir) -endif