drm: fix build without X11 headers.

Signed-off-by: Dmitry Ermilov <dmitry.ermilov@intel.com>
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index 310fb20..9d442fa 100644 (file)
--- a/dummy_drv_video/dummy_drv_video.c
+++ b/dummy_drv_video/dummy_drv_video.c
@@ -1056,10 +1056,6 @@ VAStatus dummy_PutSurface(
        )
 {
     /* TODO */
-    Drawable drawable = (Drawable)draw;
-
-    (void)drawable;
-
     return VA_STATUS_ERROR_UNKNOWN;
 }
 

diff --git a/va/sysdeps.h b/va/sysdeps.h
index 0752b17..2ab37e9 100644 (file)
--- a/va/sysdeps.h
+++ b/va/sysdeps.h
@@ -31,6 +31,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
 #include <assert.h>

diff --git a/va/va.c b/va/va.c
index f393c8c..01a1994 100644 (file)
--- a/va/va.c
+++ b/va/va.c
@@ -123,31 +123,31 @@ void va_infoMessage(const char *msg, ...)
     va_end(args);
 }
 
-static Bool va_checkVtable(void *ptr, char *function)
+static bool va_checkVtable(void *ptr, char *function)
 {
     if (!ptr) {
         va_errorMessage("No valid vtable entry for va%s\n", function);
-        return False;
+        return false;
     }
-    return True;
+    return true;
 }
 
-static Bool va_checkMaximum(int value, char *variable)
+static bool va_checkMaximum(int value, char *variable)
 {
     if (!value) {
         va_errorMessage("Failed to define max_%s in init\n", variable);
-        return False;
+        return false;
     }
-    return True;
+    return true;
 }
 
-static Bool va_checkString(const char* value, char *variable)
+static bool va_checkString(const char* value, char *variable)
 {
     if (!value) {
         va_errorMessage("Failed to define str_%s in init\n", variable);
-        return False;
+        return false;
     }
-    return True;
+    return true;
 }
 
 static inline int

diff --git a/va/va_backend.h b/va/va_backend.h
index 6c7177e..12265b4 100644 (file)
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -30,9 +30,6 @@
 #define _VA_BACKEND_H_
 
 #include <va/va.h>
-#ifndef ANDROID
-#include <X11/Xlib.h>
-#endif
 #include <linux/videodev2.h>
 
 typedef struct VADriverContext *VADriverContextP;