directfb: fix error in *SetRegion* datatypes

DirectFB comes with incorrect declarations for *SetRegion* datatypes,
this breaks the build for some GFX Drivers. Also there are some headers
missend in the archive, this breaks some other modules of directfb that
not covered yet by the autobuilders.
And at least the configure script doesn't use a variable for the
imlib2-config script. That breaks crossbuilds of directfb in most cases.

Fixes:
http://autobuild.buildroot.net/results/03465f0e14accc8d8f8fc2640b7a0dd8bec594e4

Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Carsten Schoenert 2013-05-02 09:54:08 +00:00 committed by Peter Korsgaard
parent 8867c892ae
commit de34192967
3 changed files with 1839 additions and 0 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,21 @@
Call the imlib2-conf variable that are set by ac_cv_path_IMLIB2_CONFIG
with the absolute path because the imlib2-config file is not covered
by the PATH variable.
This is important for cross compiler that need to get the staging settings
instead of the host settings.
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
--- directfb-1.6.3/configure.orig 2013-03-31 13:18:22.837560379 +0200
+++ directfb-1.6.3/configure 2013-03-31 13:23:40.177541099 +0200
@@ -19816,8 +19816,8 @@ fi
$as_echo "$as_me: WARNING: *** Imlib2 library not found, building without Imlib2 support ***" >&2;}
imlib2="no"
else
- IMLIB2_CFLAGS=`imlib2-config --cflags`
- IMLIB2_LIBS=`imlib2-config --libs`
+ IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags`
+ IMLIB2_LIBS=`$IMLIB2_CONFIG --libs`
imlib2="yes"
fi
fi

View File

@ -0,0 +1,92 @@
This patch fixes builderrors while using '--with-gfxdrivers' and
'--with-inputdrivers' with the current DirectFB version 1.6.3.
Patch is taken from
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
--- directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
+++ directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
@@ -636,7 +636,8 @@ osdSetRegion( CoreLayer
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
DFBResult ret;
@@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
layer_data, region_data,
config, updated, surface,
- palette, lock );
+ palette, left_lock, right_lock );
if (ret)
return ret;
--- directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
+++ directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
@@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
if (updated & ~CLRCF_OPTIONS) {
return OldPrimaryLayerFuncs.SetRegion( layer,
OldPrimaryLayerDriverData,
layer_data, region_data,
- config, updated, surface, palette, lock );
+ config, updated, surface, palette, left_lock, right_lock );
}
return DFB_OK;
--- directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
+++ directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
@@ -138,7 +138,8 @@ osdSetRegion( CoreLayer
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
DFBResult ret;
UcDriverData *ucdrv = (UcDriverData*) driver_data;
@@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
layer_data, region_data,
config, updated, surface,
- palette, lock );
+ palette, left_lock, right_lock );
if (ret)
return ret;
--- directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
+++ directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
@@ -135,7 +135,8 @@ osdSetRegion( CoreLayer
CoreLayerRegionConfigFlags updated,
CoreSurface *surface,
CorePalette *palette,
- CoreSurfaceBufferLock *lock )
+ CoreSurfaceBufferLock *left_lock,
+ CoreSurfaceBufferLock *right_lock )
{
DFBResult ret;
UcDriverData *ucdrv = (UcDriverData*) driver_data;
@@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
layer_data, region_data,
config, updated, surface,
- palette, lock );
+ palette, left_lock, right_lock );
if (ret)
return ret;