DirectFB-update.patch

   1 --- DirectFB-1.6.0/wm/unique/uniquewm.c.orig    2012-06-14 18:00:08.000000000 +0200
   2 +++ DirectFB-1.6.0/wm/unique/uniquewm.c 2012-06-17 13:44:30.032201512 +0200
   3 @@ -38,6 +38,8 @@
   4  #include <core/surface.h>
   5  #include <core/surface_buffer.h>
   6
   7 +#include <fusion/fusion.h>
   8 +
   9  #include <unique/context.h>
  10  #include <unique/decoration.h>
  11  #include <unique/internal.h>
  12 @@ -275,7 +277,7 @@
  13       D_MAGIC_ASSERT( wm_shared, WMShared );
  14       D_ASSERT( wm_shared->context_pool != NULL );
  15
  16 -     return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world );
  17 +     return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world, fusion_id(wm_data->world) );
  18  }
  19
  20  UniqueDecoration *
  21 @@ -286,7 +288,7 @@
  22       D_MAGIC_ASSERT( wm_shared, WMShared );
  23       D_ASSERT( wm_shared->decoration_pool != NULL );
  24
  25 -     return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world );
  26 +     return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world, fusion_id(wm_data->world) );
  27  }
  28
  29  UniqueWindow *
  30 @@ -297,7 +299,7 @@
  31       D_MAGIC_ASSERT( wm_shared, WMShared );
  32       D_ASSERT( wm_shared->window_pool != NULL );
  33
  34 -     return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world );
  35 +     return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world, fusion_id(wm_data->world) );
  36  }
  37
  38  /**************************************************************************************************/
  39 --- DirectFB-1.6.0/gfxdrivers/cle266/uc_primary.c.orig  2012-06-14 18:00:08.000000000 +0200
  40 +++ DirectFB-1.6.0/gfxdrivers/cle266/uc_primary.c       2012-06-17 21:53:26.644303701 +0200
  41 @@ -138,7 +138,8 @@
  42                CoreLayerRegionConfigFlags  updated,
  43                CoreSurface                *surface,
  44                CorePalette                *palette,
  45 -              CoreSurfaceBufferLock      *lock )
  46 +              CoreSurfaceBufferLock      *left_lock,
  47 +             CoreSurfaceBufferLock      *right_lock)
  48  {
  49       DFBResult     ret;
  50       UcDriverData *ucdrv = (UcDriverData*) driver_data;
  51 @@ -147,7 +148,7 @@
  52       ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
  53                                          layer_data, region_data,
  54                                          config, updated, surface,
  55 -                                        palette, lock );
  56 +                                        palette, left_lock, right_lock );
  57       if (ret)
  58            return ret;
  59
  60 --- DirectFB-1.6.0/gfxdrivers/cyber5k/cyber5k.c.orig    2012-06-14 18:00:08.000000000 +0200
  61 +++ DirectFB-1.6.0/gfxdrivers/cyber5k/cyber5k.c 2012-06-18 18:24:36.821203665 +0200
  62 @@ -636,7 +636,8 @@
  63                CoreLayerRegionConfigFlags  updated,
  64                CoreSurface                *surface,
  65                CorePalette                *palette,
  66 -              CoreSurfaceBufferLock      *lock )
  67 +              CoreSurfaceBufferLock      *left_lock,
  68 +              CoreSurfaceBufferLock      *right_lock )
  69  {
  70       DFBResult ret;
  71
  72 @@ -644,7 +645,7 @@
  73       ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData,
  74                                        layer_data, region_data,
  75                                        config, updated, surface,
  76 -                                      palette, lock );
  77 +                                      palette, left_lock, right_lock );
  78       if (ret)
  79            return ret;
  80
  81 --- DirectFB-1.6.0/gfxdrivers/radeon/radeon_crtc1.c.orig        2012-06-14 18:00:08.000000000 +0200
  82 +++ DirectFB-1.6.0/gfxdrivers/radeon/radeon_crtc1.c     2012-06-18 18:37:26.694504689 +0200
  83 @@ -147,14 +147,15 @@
  84                  CoreLayerRegionConfigFlags  updated,
  85                  CoreSurface                *surface,
  86                  CorePalette                *palette,
  87 -                CoreSurfaceBufferLock      *lock )
  88 +                CoreSurfaceBufferLock      *left_lock,
  89 +               CoreSurfaceBufferLock      *right_lock)
  90  {
  91
  92       if (updated & ~CLRCF_OPTIONS) {
  93            return OldPrimaryLayerFuncs.SetRegion( layer,
  94                                                   OldPrimaryLayerDriverData,
  95                                                   layer_data, region_data,
  96 -                                                 config, updated, surface, palette, lock );
  97 +                                                 config, updated, surface, palette, left_lock, right_lock );
  98       }
  99
 100       return DFB_OK;
 101 --- DirectFB-1.6.0/gfxdrivers/savage/savage_streams_old.c.orig  2012-06-14 18:00:08.000000000 +0200
 102 +++ DirectFB-1.6.0/gfxdrivers/savage/savage_streams_old.c       2012-06-18 18:53:20.997797971 +0200
 103 @@ -343,7 +343,8 @@
 104                            CoreLayerRegionConfigFlags  updated,
 105                            CoreSurface                *surface,
 106                            CorePalette                *palette,
 107 -                          CoreSurfaceBufferLock      *lock )
 108 +                          CoreSurfaceBufferLock      *lock,
 109 +                          CoreSurfaceBufferLock      *right_lock )
 110  {
 111       SavageDriverData *sdrv = (SavageDriverData*) driver_data;
 112       SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
 113 @@ -443,7 +444,8 @@
 114                             void                  *region_data,
 115                             CoreSurface           *surface,
 116                             DFBSurfaceFlipFlags    flags,
 117 -                           CoreSurfaceBufferLock *lock )
 118 +                           CoreSurfaceBufferLock *lock,
 119 +                           CoreSurfaceBufferLock *right_lock )
 120  {
 121       SavageDriverData *sdrv = (SavageDriverData*) driver_data;
 122       SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
 123 @@ -749,7 +751,8 @@
 124                          CoreLayerRegionConfigFlags  updated,
 125                          CoreSurface                *surface,
 126                          CorePalette                *palette,
 127 -                        CoreSurfaceBufferLock      *lock )
 128 +                        CoreSurfaceBufferLock      *lock,
 129 +                        CoreSurfaceBufferLock      *right_lock )
 130  {
 131       SavageDriverData *sdrv = (SavageDriverData*) driver_data;
 132       SavagePrimaryLayerData *play = (SavagePrimaryLayerData*) layer_data;
 133 @@ -760,7 +763,7 @@
 134              DFB_BYTES_PER_PIXEL(config->format) * 8);
 135
 136       ret = savage_pfuncs.SetRegion(layer, driver_data, layer_data, region_data,
 137 -                                   config, updated, surface, palette, lock);
 138 +                                   config, updated, surface, palette, lock, right_lock);
 139       if (ret != DFB_OK)
 140            return ret;
 141
 142 --- DirectFB-1.6.0/gfxdrivers/unichrome/uc_primary.c.orig       2012-06-14 18:00:08.000000000 +0200
 143 +++ DirectFB-1.6.0/gfxdrivers/unichrome/uc_primary.c    2012-06-18 19:24:44.857718919 +0200
 144 @@ -135,7 +135,8 @@
 145                CoreLayerRegionConfigFlags  updated,
 146                CoreSurface                *surface,
 147                CorePalette                *palette,
 148 -              CoreSurfaceBufferLock      *lock )
 149 +              CoreSurfaceBufferLock      *left_lock,
 150 +              CoreSurfaceBufferLock      *right_lock )
 151  {
 152       DFBResult     ret;
 153       UcDriverData *ucdrv = (UcDriverData*) driver_data;
 154 @@ -144,7 +145,7 @@
 155       ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData,
 156                                          layer_data, region_data,
 157                                          config, updated, surface,
 158 -                                        palette, lock );
 159 +                                        palette, left_lock, right_lock );
 160       if (ret)
 161            return ret;
 162