- updated linux-fusion version

[packages/DirectFB.git] / DirectFB-gcc4.patch

diff --git a/DirectFB-gcc4.patch b/DirectFB-gcc4.patch
index 0234f3def1244dfffab99365d7aeae8e1b4887e7..ff931a011c1ea18c124648dd97390a3b049aaa0d 100644 (file)
--- a/DirectFB-gcc4.patch
+++ b/DirectFB-gcc4.patch
@@ -1,30 +1,20 @@
---- DirectFB-0.9.24/include/dfb_types.h.orig   2005-07-26 22:58:50.000000000 +0200
-+++ DirectFB-0.9.24/include/dfb_types.h        2006-01-26 21:09:57.021772000 +0100
-@@ -5,15 +5,7 @@
- 
- #ifndef USE_KOS
- 
--#define __u8  u_int8_t
--#define __u16 u_int16_t
--#define __u32 u_int32_t
--#define __u64 u_int64_t
--
--#define __s8  int8_t
--#define __s16 int16_t
--#define __s32 int32_t
--#define __s64 int64_t
-+#include <asm/types.h>
- 
- #else
- 
---- DirectFB-0.9.24/include/directfb.h.orig    2005-10-24 18:29:11.000000000 +0200
-+++ DirectFB-0.9.24/include/directfb.h 2006-01-27 21:55:51.645587750 +0100
-@@ -846,7 +846,7 @@
-                                            any character advance of fixed or
-                                            proportional fonts */
-      DFDESC_FRACT_HEIGHT = 0x00000020,  /* fractional height is set */
--     DFDESC_FRACT_WIDTH  = 0x00000040,  /* fractional width is set */
-+     DFDESC_FRACT_WIDTH  = 0x00000040   /* fractional width is set */
+--- DirectFB-1.4.11/include/directfb.h.orig    2010-11-15 22:13:05.000000000 +0100
++++ DirectFB-1.4.11/include/directfb.h 2010-11-17 21:15:55.575104966 +0100
+@@ -1045,7 +1045,7 @@
+      DFDESC_FRACT_WIDTH       = 0x00000040,  /* fractional width is set */
+      DFDESC_OUTLINE_WIDTH     = 0x00000080,  /* outline width is set */
+      DFDESC_OUTLINE_OPACITY   = 0x00000100,  /* outline opacity is set */
+-     DFDESC_ROTATION          = 0x00000200,  /* rotation is set */
++     DFDESC_ROTATION          = 0x00000200   /* rotation is set */
  } DFBFontDescriptionFlags;
  
+ /*
+@@ -3314,7 +3314,7 @@
+      DSPD_DST_ATOP       = 10, /* fs: 1.0-da  fd: sa     */
+      DSPD_ADD            = 11, /* fs: 1.0     fd: 1.0    */
+      DSPD_XOR            = 12, /* fs: 1.0-da  fd: 1.0-sa */
+-     DSPD_DST            = 13, /* fs: 0.0     fd: 1.0    */
++     DSPD_DST            = 13  /* fs: 0.0     fd: 1.0    */
+ } DFBSurfacePorterDuffRule;
+ 
  /*