~ubuntu-branches/ubuntu/karmic/libsdl1.2/karmic

« back to all changes in this revision

Viewing changes to debian/patches/008_directfb_crash.diff

  • Committer: Bazaar Package Importer
  • Author(s): Tollef Fog Heen
  • Date: 2005-01-17 21:47:56 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050117214756-pi1l36nvzla0ojzr
Tags: 1.2.7+1.2.8cvs20041007-3ubuntu4
Apply patch from Debian BTS which makes libsdl1.2 build on amd64
again.  (ubuntu: #5031)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff -ruN -x Makefile.in -x configure SDL-1.2.7.orig/src/video/directfb/SDL_DirectFB_video.c SDL-1.2.7/src/video/directfb/SDL_DirectFB_video.c
2
 
--- SDL-1.2.7.orig/src/video/directfb/SDL_DirectFB_video.c      2004-02-18 12:22:05.000000000 -0500
3
 
+++ SDL-1.2.7/src/video/directfb/SDL_DirectFB_video.c   2004-06-08 13:19:41.000000000 -0400
4
 
@@ -26,7 +26,7 @@
5
 
 
6
 
 #ifdef SAVE_RCSID
7
 
 static char rcsid =
8
 
- "@(#) $Id: SDL_DirectFB_video.c,v 1.17 2004/02/13 18:39:01 slouken Exp $";
9
 
+ "@(#) $Id: SDL_DirectFB_video.c,v 1.18 2004/05/16 19:02:19 slouken Exp $";
10
 
 #endif
11
 
 
12
 
 /* DirectFB video driver implementation.
13
 
@@ -1104,9 +1104,6 @@
14
 
       HIDDEN->c2frame = NULL;
15
 
     }
16
 
 
17
 
-  this->screen->hwdata->surface = NULL;
18
 
-  this->screen->hwdata->palette = NULL;
19
 
-
20
 
   if (HIDDEN->eventbuffer)
21
 
     {
22
 
       HIDDEN->eventbuffer->Release (HIDDEN->eventbuffer);