reopen 316277
thanks
Hello,
thank you for applying the <dfb_types.h> vs. <asm/types.h> patch.
However, the applied patch is a little different from the one
I submitted and the build now still fails with the following error:
gcc -DHAVE_CONFIG_H -I. -I../../../gfxdrivers/i830 -I../.. -I../../../include
-I../../lib -I../../../lib -I../../../src -I../../../systems -D_REENTRANT -Wall
-O3 -ffast-math -pipe -D_GNU_SOURCE -Werror-implicit-function-declaration -MT
i830.lo -MD -MP -MF .deps/i830.Tpo -c ../../../gfxdrivers/i830/i830.c -fPIC
-DPIC -o .libs/i830.o
In file included from /usr/include/asm/types.h:8,
from /usr/include/linux/types.h:9,
from /usr/include/linux/agpgart.h:55,
from ../../../gfxdrivers/i830/i830.h:31,
from ../../../gfxdrivers/i830/i830.c:59:
/usr/include/asm-x86_64/types.h:23: error: conflicting types for 'int64_t'
/usr/include/sys/types.h:194: error: previous declaration of 'int64_t' was here
/usr/include/asm-x86_64/types.h:24: error: conflicting types for 'u_int64_t'
/usr/include/sys/types.h:200: error: previous declaration of 'u_int64_t' was
here
This can be avoided by including linux/agpgart.h before dfb_types.h.
With the attached patch 'directfb' can be compiled on amd64.
Regards
Andreas Jochens
diff -urN ../tmp-orig/directfb-0.9.22/debian/patches/30_linux_types.patch
./debian/patches/30_linux_types.patch
--- ../tmp-orig/directfb-0.9.22/debian/patches/30_linux_types.patch
2005-09-11 06:49:47.000000000 +0000
+++ ./debian/patches/30_linux_types.patch 2005-09-11 06:49:45.000000000
+0000
@@ -55,10 +55,39 @@
Boston, MA 02111-1307, USA.
*/
-#include <asm/types.h>
-+#include <dfb_types.h>
++#include "i830.h"
#include <stdio.h>
#include <unistd.h>
+@@ -56,7 +56,6 @@
+
+ DFB_GRAPHICS_DRIVER( i830 )
+
+-#include "i830.h"
+
+
/**************************************************************************************************/
+
+diff -Naur gfxdrivers/i830/i830_overlay.c gfxdrivers/i830/i830_overlay.c
+--- gfxdrivers/i830/i830_overlay.c 2005-02-10 11:51:59.000000000 +0000
++++ gfxdrivers/i830/i830_overlay.c 2005-09-11 06:47:52.000000000 +0000
+@@ -43,6 +43,8 @@
+ * Matt Sottek <[EMAIL PROTECTED]>
+ */
+
++#include "i830.h"
++
+ #include <math.h>
+ #include <string.h>
+
+@@ -60,8 +62,6 @@
+
+ #include <gfx/convert.h>
+
+-#include "i830.h"
+-
+
+
+ #define I830_OVERLAY_SUPPORTED_OPTIONS (DLOP_DST_COLORKEY)
diff -Naur gfxdrivers/i830/i830.h gfxdrivers/i830/i830.h
--- gfxdrivers/i830/i830.h 2005-09-10 03:44:01.000000000 +0300
+++ gfxdrivers/i830/i830.h 2005-09-10 03:47:45.000000000 +0300
@@ -67,8 +96,8 @@
#define __I830_H__
-#include <asm/types.h>
-+#include <dfb_types.h>
#include <linux/agpgart.h>
++#include <dfb_types.h>
#include <core/gfxcard.h>
diff -Naur gfxdrivers/nsc/nsc.c gfxdrivers/nsc/nsc.c
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
