cirros-testvm/src-cirros/buildroot-2015.05/package/directfb/0004-setregion-lock.patch

   1 This patch fixes builderrors while using '--with-gfxdrivers' and
   2 '--with-inputdrivers' with the current DirectFB version 1.6.3.
   3
   4 Patch is taken from
   5 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch
   6
   7 Signed-off-by: Carsten Schoenert <c.schoenert@gmail.com>
   8
   9 --- directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
  10 +++ directfb-1.6.3/gfxdrivers/cyber5k/cyber5k.c
  11 @@ -636,7 +636,8 @@ osdSetRegion( CoreLayer
  12                CoreLayerRegionConfigFlags  updated,
  13                CoreSurface                *surface,
  14                CorePalette                *palette,
  15 -              CoreSurfaceBufferLock      *lock )
  16 +              CoreSurfaceBufferLock      *left_lock,
  17 +              CoreSurfaceBufferLock      *right_lock )
  18  {
  19       DFBResult ret;
  20
  21 @@ -644,7 +645,7 @@ osdSetRegion( CoreLayer
  22       ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
  23                                        layer_data, region_data,
  24                                        config, updated, surface,
  25 -                                      palette, lock );
  26 +                                      palette, left_lock, right_lock );
  27       if (ret)
  28            return ret;
  29
  30 --- directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
  31 +++ directfb-1.6.3/gfxdrivers/radeon/radeon_crtc1.c
  32 @@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer
  33                  CoreLayerRegionConfigFlags  updated,
  34                  CoreSurface                *surface,
  35                  CorePalette                *palette,
  36 -                CoreSurfaceBufferLock      *lock )
  37 +                CoreSurfaceBufferLock      *left_lock,
  38 +                CoreSurfaceBufferLock      *right_lock )
  39  {
  40
  41       if (updated & ~CLRCF_OPTIONS) {
  42            return OldPrimaryLayerFuncs.SetRegion( layer,
  43                                                   OldPrimaryLayerDriverData,
  44                                                   layer_data, region_data,
  45 -                                                 config, updated, surface, palette, lock );
  46 +                                                 config, updated, surface, palette, left_lock, right_lock );
  47       }
  48
  49       return DFB_OK;
  50 --- directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
  51 +++ directfb-1.6.3/gfxdrivers/cle266/uc_primary.c
  52 @@ -138,7 +138,8 @@ osdSetRegion( CoreLayer
  53                CoreLayerRegionConfigFlags  updated,
  54                CoreSurface                *surface,
  55                CorePalette                *palette,
  56 -              CoreSurfaceBufferLock      *lock )
  57 +              CoreSurfaceBufferLock      *left_lock,
  58 +              CoreSurfaceBufferLock      *right_lock )
  59  {
  60       DFBResult     ret;
  61       UcDriverData *ucdrv = (UcDriverData*) driver_data;
  62 @@ -147,7 +148,7 @@ osdSetRegion( CoreLayer
  63       ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
  64                                          layer_data, region_data,
  65                                          config, updated, surface,
  66 -                                        palette, lock );
  67 +                                        palette, left_lock, right_lock );
  68       if (ret)
  69            return ret;
  70
  71 --- directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
  72 +++ directfb-1.6.3/gfxdrivers/unichrome/uc_primary.c
  73 @@ -135,7 +135,8 @@ osdSetRegion( CoreLayer
  74                CoreLayerRegionConfigFlags  updated,
  75                CoreSurface                *surface,
  76                CorePalette                *palette,
  77 -              CoreSurfaceBufferLock      *lock )
  78 +              CoreSurfaceBufferLock      *left_lock,
  79 +              CoreSurfaceBufferLock      *right_lock )
  80  {
  81       DFBResult     ret;
  82       UcDriverData *ucdrv = (UcDriverData*) driver_data;
  83 @@ -144,7 +145,7 @@ osdSetRegion( CoreLayer
  84       ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
  85                                          layer_data, region_data,
  86                                          config, updated, surface,
  87 -                                        palette, lock );
  88 +                                        palette, left_lock, right_lock );
  89       if (ret)
  90            return ret;
  91
  92