- added updates patch (from dfb CVS) to build with 0.9.20 API

[packages/DirectFB-extra.git] / DirectFB-extra-updates.patch

--- DirectFB-extra-0.9.16/interfaces/IDirectFBImageProvider/idirectfbimageprovider_imlib2.c.orig	2002-08-26 21:14:16.000000000 +0200
+++ DirectFB-extra-0.9.16/interfaces/IDirectFBImageProvider/idirectfbimageprovider_imlib2.c	2004-01-17 17:02:03.134903832 +0100
@@ -259,11 +259,8 @@
      if (err)
           return err;
 
-     dst += rect.x * DFB_BYTES_PER_PIXEL(format) + rect.y * pitch;
-
-     dfb_scale_linear_32( dst, image_data,
-                          src_width, src_height, rect.w, rect.h,
-                          pitch, format, dst_surface->palette );
+     dfb_scale_linear_32( image_data, src_width, src_height,
+		          dst, pitch, &rect, dst_surface );
 
      destination->Unlock( destination );
      return DFB_OK;
--- DirectFB-extra-0.9.16/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_swf.c.orig	2003-01-13 13:50:35.000000000 +0100
+++ DirectFB-extra-0.9.16/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_swf.c	2004-01-17 17:08:12.979678880 +0100
@@ -316,7 +316,7 @@
      data->callback = callback;
      data->ctx = ctx;
 
-     if (data->thread == -1)
+     if ((int) data->thread == -1)
           pthread_create( &data->thread, NULL, FrameThread, data );
 
      return DFB_OK;
@@ -327,10 +327,10 @@
 {
      INTERFACE_GET_DATA(IDirectFBVideoProvider_Swf)
 
-     if (data->thread != -1) {
+     if ((int) data->thread != -1) {
           pthread_cancel( data->thread );
           pthread_join( data->thread, NULL );
-          data->thread = -1;
+          data->thread = (pthread_t) -1;
      }
 
      if (data->destination) {
@@ -455,7 +455,7 @@
      data->flashDisplay.depth = 16;
      data->flashDisplay.bpp = 2;
 
-     data->thread = -1;     
+     data->thread = (pthread_t) -1;     
 
 /*
      pthread_mutex_init( &data->source.front_lock, NULL );
--- DirectFB-extra-0.9.16/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c.orig	2002-12-29 01:17:08.000000000 +0100
+++ DirectFB-extra-0.9.16/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c	2004-01-17 17:05:25.624120792 +0100
@@ -45,6 +45,7 @@
 
 #include <misc/util.h>
 #include <misc/mem.h>
+#include <misc/memcpy.h>
 
 #include <core/coredefs.h>
 #include <core/coretypes.h>
@@ -246,7 +247,7 @@
      __u8  *src = (__u8*) s;
 
      for (i=0; i<len; i++) {
-          dst[i] = 0x8000 | PIXEL_RGB15( src[0], src[1], src[2] );
+          dst[i] = PIXEL_ARGB1555( 0xff, src[0], src[1], src[2] );
 
           src += 3;
      }