xfree86: dri: move over public SDK headers to include/

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

hw/xfree86/dri/dri.c

@@ -42,11 +42,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xfuncproto.h>
 #include <X11/Xproto.h>
+#include <X11/dri/xf86driproto.h>
 
 #include "dix/dix_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "dix/screenint_priv.h"
+#include "include/dristruct.h"
 #include "include/extinit.h"
+#include "include/sarea.h"
 
 #include "xf86.h"
 #include "xf86drm.h"
@@ -57,12 +60,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
-#include <X11/dri/xf86driproto.h>
 #include "swaprep.h"
 #include "xf86str.h"
 #include "dri_priv.h"
-#include "sarea.h"
-#include "dristruct.h"
 #include "mi.h"
 #include "mipointer.h"
 #include "xf86_os_support.h"

hw/xfree86/dri/meson.build

@@ -12,12 +12,3 @@ xorg_dri = static_library('xorg_dri',
     ],
     c_args: xorg_c_args,
 )
-
-install_data(
-    [
-        'dri.h',
-        'sarea.h',
-        'dristruct.h',
-    ],
-    install_dir: xorgsdkdir,
-)

hw/xfree86/dri/xf86dri.c

@@ -37,10 +37,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/dri/xf86driproto.h>
 
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
 #include "dix/screenint_priv.h"
+#include "include/dristruct.h"
+#include "include/sarea.h"
 
 #include "xf86.h"
 #include "misc.h"
@@ -49,12 +52,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "cursorstr.h"
 #include "scrnintstr.h"
 #include "servermd.h"
-#include <X11/dri/xf86driproto.h>
 #include "swaprep.h"
 #include "xf86str.h"
 #include "dri_priv.h"
-#include "sarea.h"
-#include "dristruct.h"
 #include "xf86drm.h"
 #include "protocol-versions.h"
 #include "xf86Extensions.h"

hw/xquartz/xpr/appledri.c

@@ -54,7 +54,7 @@
 #define _APPLEDRI_SERVER_
 #include "appledristr.h"
 #include "swaprep.h"
-#include "dri.h"
+#include "xpr_dri.h"
 #include "dristruct.h"
 #include "xpr.h"
 #include "x-hash.h"

hw/xquartz/xpr/dri.c

@@ -58,7 +58,7 @@
 #define _APPLEDRI_SERVER_
 #include "appledristr.h"
 #include "swaprep.h"
-#include "dri.h"
+#include "xpr_dri.h"
 #include "dristruct.h"
 #include "mi.h"
 #include "mipointer.h"

hw/xquartz/xpr/driWrap.c

@@ -37,7 +37,7 @@
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "driWrap.h"
-#include "dri.h"
+#include "xpr_dri.h"
 
 #include <OpenGL/OpenGL.h>
 

hw/xquartz/xpr/dristruct.h

@@ -35,7 +35,7 @@
 #ifndef DRI_STRUCT_H
 #define DRI_STRUCT_H
 
-#include "dri.h"
+#include "xpr_dri.h"
 #include "x-list.h"
 
 #define DRI_MAX_DRAWABLES 256

hw/xquartz/xpr/xprScreen.c

@@ -42,7 +42,7 @@
 #include "pseudoramiX.h"
 #include "darwinEvents.h"
 #include "rootless.h"
-#include "dri.h"
+#include "xpr_dri.h"
 #include "globals.h"
 #include <Xplugin.h>
 #include "applewmExt.h"

include/dristruct.h

@@ -34,6 +34,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef DRI_STRUCT_H
 #define DRI_STRUCT_H
 
+#include "dri.h"
+#include "sarea.h"
 #include "xf86drm.h"
 #include "xf86Crtc.h"
 

include/meson.build

@@ -429,8 +429,10 @@ if build_xorg
             'dixfont.h',
             'dixfontstr.h',
             'dixstruct.h',
+            'dri.h',
             'dri2.h',
             'dri3.h',
+            'dristruct.h',
             'events.h',
             'exa.h',
             'exevents.h',
@@ -488,6 +490,7 @@ if build_xorg
             'regionstr.h',
             'resource.h',
             'rgb.h',
+            'sarea.h',
             'screenint.h',
             'scrnintstr.h',
             'servermd.h',