SOURCES: DirectFB-fix.patch, DirectFB-gcc4.patch - merged update f...

[qboosh]

Author: qboosh                       Date: Sun Mar 11 12:17:38 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged update for 1.0.0 from AC-branch

---- Files affected:
SOURCES:
   DirectFB-fix.patch (1.3 -> 1.4) , DirectFB-gcc4.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/DirectFB-fix.patch
diff -u SOURCES/DirectFB-fix.patch:1.3 SOURCES/DirectFB-fix.patch:1.4
--- SOURCES/DirectFB-fix.patch:1.3	Sat Mar  5 00:12:14 2005
+++ SOURCES/DirectFB-fix.patch	Sun Mar 11 13:17:32 2007
@@ -20,3 +20,23 @@
  
  
  include $(top_srcdir)/rules/libobject.make
+--- DirectFB-1.0.0.orig/gfxdrivers/matrox/matrox_maven.c	2007-01-27 23:22:14.000000000 +0100
++++ DirectFB-1.0.0/gfxdrivers/matrox/matrox_maven.c	2007-03-07 12:45:56.000000000 +0100
+@@ -37,7 +37,6 @@
+ #include <sysfs/libsysfs.h>
+ #endif
+ 
+-#include <linux/i2c.h>
+ #include <linux/i2c-dev.h>
+ 
+ #include <directfb.h>
+--- DirectFB-1.0.0.orig/include/dfb_types.h	2007-03-03 21:36:07.000000000 +0100
++++ DirectFB-1.0.0/include/dfb_types.h	2007-03-09 12:20:59.000000000 +0100
+@@ -29,6 +29,7 @@
+ #ifndef __DFB_TYPES_H__
+ #define __DFB_TYPES_H__
+ 
++#include <asm/types.h>
+ 
+ #ifdef USE_KOS
+ 

================================================================
Index: SOURCES/DirectFB-gcc4.patch
diff -u SOURCES/DirectFB-gcc4.patch:1.2 SOURCES/DirectFB-gcc4.patch:1.3
--- SOURCES/DirectFB-gcc4.patch:1.2	Fri Jan 27 21:57:38 2006
+++ SOURCES/DirectFB-gcc4.patch	Sun Mar 11 13:17:33 2007
@@ -1,24 +1,15 @@
---- 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>
+diff -ur DirectFB-1.0.0.orig/include/directfb.h DirectFB-1.0.0/include/directfb.h
+--- DirectFB-1.0.0.orig/include/directfb.h	2007-03-09 11:43:31.000000000 +0100
++++ DirectFB-1.0.0/include/directfb.h	2007-03-09 14:22:40.000000000 +0100
+@@ -674,7 +674,7 @@
+      DSBLIT_SRC_PREMULTCOLOR   = 0x00000200, /* modulates the source color with the color alpha */
+      DSBLIT_XOR                = 0x00000400, /* bitwise xor the destination pixels with the
+                                                 source pixels after premultiplication */
+-     DSBLIT_INDEX_TRANSLATION  = 0x00000800, /* do fast indexed to indexed translation,
++     DSBLIT_INDEX_TRANSLATION  = 0x00000800  /* do fast indexed to indexed translation,
+                                                 this flag is mutual exclusive with all others */
+ } DFBSurfaceBlittingFlags;
  
- #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 */
@@ -26,5 +17,32 @@
 -     DFDESC_FRACT_WIDTH  = 0x00000040,  /* fractional width is set */
 +     DFDESC_FRACT_WIDTH  = 0x00000040   /* fractional width is set */
  } DFBFontDescriptionFlags;
+ 
+ /*
+@@ -1006,7 +1006,7 @@
+      DSPF_RGB18     = DFB_SURFACE_PIXELFORMAT( 24, 18, 0, 0, 0, 3, 0, 0, 0, 0, 0 ),
+ 
+      /*  2 bit   LUT (1 byte/ 4 pixel, 2 bit color and alpha lookup from palette) */
+-     DSPF_LUT2      = DFB_SURFACE_PIXELFORMAT( 25,  2, 0, 1, 2, 0, 3, 0, 0, 1, 0 ),
++     DSPF_LUT2      = DFB_SURFACE_PIXELFORMAT( 25,  2, 0, 1, 2, 0, 3, 0, 0, 1, 0 )
+ 
+ } DFBSurfacePixelFormat;
+ 
+@@ -1295,7 +1295,7 @@
+      DVCAPS_HUE         = 0x00000040,  /* supports Hue adjustment          */
+      DVCAPS_SATURATION  = 0x00000080,  /* supports Saturation adjustment   */
+      DVCAPS_INTERACTIVE = 0x00000100,  /* supports SendEvent               */
+-     DVCAPS_VOLUME      = 0x00000200,  /* supports Volume adjustment       */
++     DVCAPS_VOLUME      = 0x00000200   /* supports Volume adjustment       */
+ } DFBVideoProviderCapabilities;
+ 
+ /*
+@@ -2878,7 +2878,7 @@
+      DSPD_SRC_ATOP       =  9, /* fs: da      fd: 1.0-sa */
+      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_XOR            = 12  /* fs: 1.0-da  fd: 1.0-sa */
+ } DFBSurfacePorterDuffRule;
  
  /*
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/DirectFB-fix.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/DirectFB-gcc4.patch?r1=1.2&r2=1.3&f=u