tags 316277 +patch severity 316277 serious thanks With the attached patch 'directfb' can be compiled on amd64.
The patch basically includes <dfb_types.h> instead of <asm/types.h> in several places. It also removes the wrong patch 'debian/patches/13_linux_types.patch' entirely. Regards Andreas Jochens diff -urN ../tmp-orig/directfb-0.9.22/debian/patches/12_remove_sys_io.h.patch ./debian/patches/12_remove_sys_io.h.patch --- ../tmp-orig/directfb-0.9.22/debian/patches/12_remove_sys_io.h.patch 2005-09-01 10:14:52.000000000 +0000 +++ ./debian/patches/12_remove_sys_io.h.patch 2005-09-01 10:14:50.000000000 +0000 @@ -4,9 +4,10 @@ @@ -28,7 +28,6 @@ #define __I830_H__ - #include <asm/types.h> +-#include <asm/types.h> -#include <sys/io.h> #include <linux/agpgart.h> ++#include <dfb_types.h> #include <core/gfxcard.h> --- gfxdrivers/savage/savage3d.c 2004-04-21 16:50:37.000000000 +0300 diff -urN ../tmp-orig/directfb-0.9.22/debian/patches/13_linux_types.patch ./debian/patches/13_linux_types.patch --- ../tmp-orig/directfb-0.9.22/debian/patches/13_linux_types.patch 2005-09-01 10:14:52.000000000 +0000 +++ ./debian/patches/13_linux_types.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#DPATCHLEVEL=0 ---- include/dfb_types.h 2004-04-29 22:08:37.000000000 +0300 -+++ include/dfb_types.h 2005-07-16 04:33:18.000000000 +0300 -@@ -2,6 +2,10 @@ - #define __DFB_TYPES_H__ - - #include <sys/types.h> -+/* FIXME: Linux types should not be used on user-land. */ -+#if defined(__x86_64__) -+#include <linux/types.h> -+#else - - #define __u8 u_int8_t - #define __u16 u_int16_t -@@ -12,5 +16,6 @@ - #define __s16 int16_t - #define __s32 int32_t - #define __s64 int64_t -+#endif - - #endif diff -urN ../tmp-orig/directfb-0.9.22/debian/patches/23_fbdev.patch ./debian/patches/23_fbdev.patch --- ../tmp-orig/directfb-0.9.22/debian/patches/23_fbdev.patch 2005-09-01 10:14:52.000000000 +0000 +++ ./debian/patches/23_fbdev.patch 2005-09-01 10:13:45.000000000 +0000 @@ -562,7 +562,7 @@ +#define _LINUX_SISFB + +#include <asm/ioctl.h> -+#include <asm/types.h> ++#include <dfb_types.h> + +/**********************************************/ +/* PUBLIC */ @@ -827,7 +827,7 @@ +#ifndef _LINUX_FB_H +#define _LINUX_FB_H + -+#include <asm/types.h> ++#include <dfb_types.h> + +/* Definitions of frame buffers */ + @@ -1772,3 +1772,104 @@ #include "vt.h" /* +diff -urN ../tmp-orig/directfb-0.9.22/gfxdrivers/cyber5k/cyber5k.h ./gfxdrivers/cyber5k/cyber5k.h +--- ../tmp-orig/directfb-0.9.22/gfxdrivers/cyber5k/cyber5k.h 2003-12-05 04:01:06.000000000 +0000 ++++ ./gfxdrivers/cyber5k/cyber5k.h 2005-09-01 09:17:07.000000000 +0000 +@@ -28,7 +28,7 @@ + #ifndef ___CYBER5K_H__ + #define ___CYBER5K_H__ + +-#include <asm/types.h> ++#include <dfb_types.h> + #include <core/layers.h> + + /* HACK */ +diff -urN ../tmp-orig/directfb-0.9.22/gfxdrivers/cyber5k/mmio.h ./gfxdrivers/cyber5k/mmio.h +--- ../tmp-orig/directfb-0.9.22/gfxdrivers/cyber5k/mmio.h 2003-12-05 04:01:06.000000000 +0000 ++++ ./gfxdrivers/cyber5k/mmio.h 2005-09-01 09:14:28.000000000 +0000 +@@ -28,7 +28,7 @@ + #ifndef __CYBER5K_MMIO__ + #define __CYBER5K_MMIO__ + +-#include <asm/types.h> ++#include <dfb_types.h> + #include "cyber5k.h" + #include "regs.h" + +--- sis315_mmio.h 2003-11-20 10:38:37.000000000 +0000 ++++ gfxdrivers/sis315/sis315_mmio.h 2005-09-01 09:46:20.000000000 +0000 +@@ -1,7 +1,7 @@ + #ifndef _SIS315_MMIO_H + #define _SIS315_MMIO_H + +-#include <asm/types.h> ++#include <dfb_types.h> + + extern __inline__ __u32 sis_rl(volatile __u8 *mmio, unsigned int offset); + extern __inline__ void sis_wl(volatile __u8 *mmio, unsigned int offset, __u32 value); +diff -urN ../tmp-orig/directfb-0.9.22/gfxdrivers/i810/i810.c ./gfxdrivers/i810/i810.c +--- ../tmp-orig/directfb-0.9.22/gfxdrivers/i810/i810.c 2004-08-27 19:55:58.000000000 +0000 ++++ ./gfxdrivers/i810/i810.c 2005-09-01 09:32:40.000000000 +0000 +@@ -21,7 +21,7 @@ + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ +-#include <asm/types.h> ++#include <dfb_types.h> + + #include <stdio.h> + #include <unistd.h> +diff -urN ../tmp-orig/directfb-0.9.22/gfxdrivers/i810/i810.h ./gfxdrivers/i810/i810.h +--- ../tmp-orig/directfb-0.9.22/gfxdrivers/i810/i810.h 2003-03-26 16:51:13.000000000 +0000 ++++ ./gfxdrivers/i810/i810.h 2005-09-01 09:32:49.000000000 +0000 +@@ -38,7 +38,7 @@ + #ifndef __I810_H__ + #define __I810_H__ + +-#include <asm/types.h> ++#include <dfb_types.h> + #include <sys/io.h> + #include <linux/agpgart.h> + +diff -urN ../tmp-orig/directfb-0.9.22/gfxdrivers/i830/i830.c ./gfxdrivers/i830/i830.c +--- ../tmp-orig/directfb-0.9.22/gfxdrivers/i830/i830.c 2005-02-10 11:47:17.000000000 +0000 ++++ ./gfxdrivers/i830/i830.c 2005-09-01 10:10:34.000000000 +0000 +@@ -23,7 +23,7 @@ + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ +-#include <asm/types.h> ++#include "i830.h" + + #include <stdio.h> + #include <unistd.h> +@@ -56,8 +56,7 @@ + + DFB_GRAPHICS_DRIVER( i830 ) + +-#include "i830.h" + + /**************************************************************************************************/ + + #define TIMER_LOOP 1000000000 +diff -urN ../tmp-orig/directfb-0.9.22/gfxdrivers/i830/i830_overlay.c ./gfxdrivers/i830/i830_overlay.c +--- ../tmp-orig/directfb-0.9.22/gfxdrivers/i830/i830_overlay.c 2005-02-10 11:51:59.000000000 +0000 ++++ ./gfxdrivers/i830/i830_overlay.c 2005-09-01 10:01:34.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) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
