On Mon, 8 Mar 2010, Yuan, Shengquan wrote:
On Fri, Mar 5, 2010 at 3:01 PM, Gwenole Beauchesne
<gbeauche...@splitted-desktop.com> wrote:
Le 5 mars 10 à 07:19, Gwenole Beauchesne a écrit :
Could you please apply the following? This just moves files around so that
a future patch can also remove the ugly IN_LIBVA ifdefs completely.
Then, here is the patch that removes the IN_LIBVA ifdefs from system
headers.
Done, but I still keep drivers in top dir, so that we can have a flat
directory. Please see if we still need some change.
I have attached a few patches:
* Fix drivers build (missing includes, CFLAGS):
libva.reorg.missing.includes.patch
* Drop <va/va_x11.h> include from <va_backend.h> as it's now useless:
libva.reorg.drop.va_x11.from.backend.patch
Regards,
Gwenole.
commit 54b062ba8ae379f7ca099972fc365cfa7054e94e
Author: Gwenole Beauchesne <gbeauche...@splitted-desktop.com>
Date: Mon Mar 8 09:41:41 2010 +0100
Fix drivers build.
diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index 1957f62..98561a9 100644
--- a/dummy_drv_video/dummy_drv_video.c
+++ b/dummy_drv_video/dummy_drv_video.c
@@ -28,6 +28,7 @@
#include "assert.h"
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
diff --git a/i965_drv_video/Makefile.am b/i965_drv_video/Makefile.am
index 0a36fa8..88b5590 100644
--- a/i965_drv_video/Makefile.am
+++ b/i965_drv_video/Makefile.am
@@ -22,7 +22,7 @@
SUBDIRS = shaders
-AM_CFLAGS = -Wall -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 @DRM_CFLAGS@
+AM_CFLAGS = -Wall -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 @DRM_CFLAGS@
i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 260a053..6a60ecc 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -27,6 +27,7 @@
*
*/
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
diff --git a/i965_drv_video/i965_render.c b/i965_drv_video/i965_render.c
index 6221c52..4a4f041 100644
--- a/i965_drv_video/i965_render.c
+++ b/i965_drv_video/i965_render.c
@@ -32,6 +32,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
diff --git a/i965_drv_video/intel_batchbuffer.c b/i965_drv_video/intel_batchbuffer.c
index 21e5719..9fabf6a 100644
--- a/i965_drv_video/intel_batchbuffer.c
+++ b/i965_drv_video/intel_batchbuffer.c
@@ -25,6 +25,7 @@
*
**************************************************************************/
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
commit d4b0fbdea8a8fd1ca9fe78006ca355cd2f3bea56
Author: Gwenole Beauchesne <gbeauche...@splitted-desktop.com>
Date: Mon Mar 8 09:48:47 2010 +0100
Drop <va/va_x11.h> include from <va/va_backend.h> as it is pointless.
diff --git a/va/va_backend.h b/va/va_backend.h
index c7ae5a1..ff86744 100644
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -30,8 +30,6 @@
#define _VA_BACKEND_H_
#include <va/va.h>
-#include <va/va_x11.h>
-
#include <X11/Xlib.h>
#include <linux/videodev2.h>
_______________________________________________
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva
