render: move it under Xext/

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

Xext/meson.build

@@ -55,6 +55,7 @@ subdir('dri2')
 subdir('dri3')
 subdir('panoramiX')
 subdir('present')
+subdir('render')
 subdir('xf86bigfont')
 subdir('composite')
 if build_xwin or build_xquartz

Xext/panoramiX/panoramiX.c

@@ -44,6 +44,7 @@ Equipment Corporation.
 #include "Xext/damage/damageext_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"
+#include "Xext/render/picturestr_priv.h"
 
 #include "misc.h"
 #include "cursor.h"
@@ -59,7 +60,6 @@ Equipment Corporation.
 #include "globals.h"
 #include "servermd.h"
 #include "resource.h"
-#include "picturestr_priv.h"
 #include "xfixesint.h"
 #include "protocol-versions.h"
 

exa/exa_glyphs.c

@@ -45,9 +45,9 @@
 #include <stdlib.h>
 
 #include "include/mipict.h"
+#include "Xext/render/glyphstr_priv.h"
 
 #include "exa_priv.h"
-#include "glyphstr_priv.h"
 
 #if DEBUG_GLYPH_CACHE
 #define DBG_GLYPH_CACHE(a) ErrorF a

fb/fbpict.c

@@ -29,9 +29,9 @@
 
 #include "fb/fbpict_priv.h"
 #include "include/mipict.h"
+#include "Xext/render/glyphstr_priv.h"
 
 #include "fb.h"
-#include "glyphstr_priv.h"
 #include "picturestr.h"
 
 void

glamor/glamor_composite_glyphs.c

@@ -31,7 +31,7 @@
 #include "glamor_priv.h"
 #include "glamor_transform.h"
 #include "glamor_transfer.h"
-#include "glyphstr_priv.h"
+#include "Xext/render/glyphstr_priv.h"
 
 #define DEFAULT_ATLAS_DIM       1024
 

meson.build

@@ -691,7 +691,6 @@ inc = include_directories(
     'miext/sync',
     'dix',
     'include',
-    'render',
     'xfixes',
     epoll_inc,
 )
@@ -796,7 +795,6 @@ if build_xserver
     if build_rootless
         subdir('miext/rootless')
     endif
-    subdir('render')
     subdir('xfixes')
     subdir('xkb')
     subdir('Xext')

miext/damage/damage.c

@@ -27,6 +27,7 @@
 #include "dix/screen_hooks_priv.h"
 #include "include/mipict.h"
 #include "os/osdep.h"
+#include "Xext/render/glyphstr_priv.h"
 
 #include    <X11/X.h>
 #include    "scrnintstr.h"
@@ -41,7 +42,6 @@
 #include    "gcstruct.h"
 #include    "damage.h"
 #include    "damagestr.h"
-#include    "glyphstr_priv.h"
 
 #define wrap(priv, real, mem, func) {\
     priv->mem = real->mem; \

xfixes/region.c

@@ -26,9 +26,9 @@
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
 #include "dix/window_priv.h"
-#include "render/picturestr_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"
+#include "Xext/render/picturestr_priv.h"
 
 #include "xfixesint.h"
 #include "scrnintstr.h"