present: move over public SDK header to include/

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

glx/glxcmds.c

@@ -2473,8 +2473,6 @@ __glXpresentCompleteNotify(WindowPtr window, CARD8 present_kind, CARD8 present_m
     __glXsendSwapEvent(drawable, glx_type, ust, msc, serial);
 }
 
-#include <present.h>
-
 void
 __glXregisterPresentCompleteNotify(void)
 {

hw/xfree86/drivers/video/modesetting/present.c

@@ -34,11 +34,12 @@
 #include <sys/types.h>
 #include <time.h>
 
+#include "include/present.h"
+
 #include <xf86.h>
 #include <xf86Crtc.h>
 #include <xf86drm.h>
 #include <xf86str.h>
-#include <present.h>
 
 #include "driver.h"
 #include "drmmode_display.h"

include/meson.build

@@ -461,6 +461,7 @@ if build_xorg
             'opaque.h',
             'optionstr.h',
             'os.h',
+            'present.h',
             'pixmap.h',
             'pixmapstr.h',
             'privates.h',

include/present.h

@@ -24,6 +24,7 @@
 #define _PRESENT_H_
 
 #include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
 #include <X11/extensions/presentproto.h>
 
 #include "randrstr.h"

present/meson.build

@@ -11,10 +11,6 @@ srcs_present = [
     'present_vblank.c',
 ]
 
-hdrs_present = [
-    'present.h',
-]
-
 libxserver_present = static_library('xserver_present',
     srcs_present,
     include_directories: inc,
@@ -24,7 +20,3 @@ libxserver_present = static_library('xserver_present',
         dependency('presentproto', version: '>= 1.2')
     ],
 )
-
-if build_xorg
-    install_data(hdrs_present, install_dir: xorgsdkdir)
-endif

present/present_priv.h

@@ -26,7 +26,7 @@
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
-#include "present/present.h"
+#include "include/present.h"
 
 #include "scrnintstr.h"
 #include "misc.h"