haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged in James Woodcock's gcc4 SDL fix into the patch for sdl-1.2-hg, and made a new libsdl-1.2.14.patch as

Browse Source 
well.
This commit is contained in:
Scott McCreary
2010-06-06 09:16:25 +00:00
parent ec2fcb667f
commit 7a95d3edf5
2 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media-libs/libsdl/patches/libsdl-1.2-hg.patch
View File

@@ -1,6 +1,6 @@
diff -r 31b0f2e06e3c src/main/beos/SDL_BeApp.cc
--- a/src/main/beos/SDL_BeApp.cc Sun Apr 25 20:16:38 2010 -0400
+++ b/src/main/beos/SDL_BeApp.cc Sun Jun 06 07:56:39 2010 +0000
--- libsdl-1.2-hg/src/main/beos/SDL_BeApp.cc Sun Apr 25 20:16:38 2010 -0400
+++ libsdl-1.2-hg-haiku/src/main/beos/SDL_BeApp.cc Sun Jun 06 08:55:47 2010 +0000
@@ -39,13 +39,15 @@
static int StartBeApp(void *unused)
@@ -27,3 +27,26 @@ diff -r 31b0f2e06e3c src/main/beos/SDL_BeApp.cc
}
/* Quit the Be Application, if there's nothing left to do */
diff -r 31b0f2e06e3c src/video/bwindow/SDL_sysvideo.cc
--- libsdl-1.2-hg/src/video/bwindow/SDL_sysvideo.cc Sun Apr 25 20:16:38 2010 -0400
+++ libsdl-1.2-hg-haiku/src/video/bwindow/SDL_sysvideo.cc Sun Jun 06 08:55:47 2010 +0000
@@ -57,7 +57,6 @@
static void BE_FreeHWSurface(_THIS, SDL_Surface *surface);
static int BE_ToggleFullScreen(_THIS, int fullscreen);
-static SDL_Overlay *BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface *display);
/* OpenGL functions */
#if SDL_VIDEO_OPENGL
diff -r 31b0f2e06e3c src/video/bwindow/SDL_sysyuv.h
--- libsdl-1.2-hg/src/video/bwindow/SDL_sysyuv.h Sun Apr 25 20:16:38 2010 -0400
+++ libsdl-1.2-hg-haiku/src/video/bwindow/SDL_sysyuv.h Sun Jun 06 08:55:47 2010 +0000
@@ -62,7 +62,7 @@
};
extern BBitmap * BE_GetOverlayBitmap(BRect bounds, color_space cs);
-SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display);
+extern SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display);
extern int BE_LockYUVOverlay(_THIS, SDL_Overlay* overlay);
extern void BE_UnlockYUVOverlay(_THIS, SDL_Overlay* overlay);
extern int BE_DisplayYUVOverlay(_THIS, SDL_Overlay* overlay, SDL_Rect* src, SDL_Rect* dst);

52
media-libs/libsdl/patches/libsdl-1.2.14.patch Normal file
View File

@@ -0,0 +1,52 @@
diff -r 31b0f2e06e3c src/main/beos/SDL_BeApp.cc
--- SDL-1.2.14/src/main/beos/SDL_BeApp.cc Sun Apr 25 20:16:38 2010 -0400
+++ SDL-1.2.14-haiku/src/main/beos/SDL_BeApp.cc Sun Jun 06 08:55:47 2010 +0000
@@ -39,13 +39,15 @@
static int StartBeApp(void *unused)
{
+ if(!be_app) {
BApplication *App;
App = new BApplication("application/x-SDL-executable");
App->Run();
delete App;
- return(0);
+ }
+ return(0);
}
/* Initialize the Be Application, if it's not already started */
@@ -86,7 +88,7 @@
++SDL_BeAppActive;
/* The app is running, and we're ready to go */
- return(0);
+ return(0);
}
/* Quit the Be Application, if there's nothing left to do */
diff -r 31b0f2e06e3c src/video/bwindow/SDL_sysvideo.cc
--- SDL-1.2.14/src/video/bwindow/SDL_sysvideo.cc Sun Apr 25 20:16:38 2010 -0400
+++ SDL-1.2.14-haiku/src/video/bwindow/SDL_sysvideo.cc Sun Jun 06 08:55:47 2010 +0000
@@ -57,7 +57,6 @@
static void BE_FreeHWSurface(_THIS, SDL_Surface *surface);
static int BE_ToggleFullScreen(_THIS, int fullscreen);
-static SDL_Overlay *BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface *display);
/* OpenGL functions */
#if SDL_VIDEO_OPENGL
diff -r 31b0f2e06e3c src/video/bwindow/SDL_sysyuv.h
--- SDL-1.2.14/src/video/bwindow/SDL_sysyuv.h Sun Apr 25 20:16:38 2010 -0400
+++ SDL-1.2.14-haiku/src/video/bwindow/SDL_sysyuv.h Sun Jun 06 08:55:47 2010 +0000
@@ -62,7 +62,7 @@
};
extern BBitmap * BE_GetOverlayBitmap(BRect bounds, color_space cs);
-SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display);
+extern SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display);
extern int BE_LockYUVOverlay(_THIS, SDL_Overlay* overlay);
extern void BE_UnlockYUVOverlay(_THIS, SDL_Overlay* overlay);
extern int BE_DisplayYUVOverlay(_THIS, SDL_Overlay* overlay, SDL_Rect* src, SDL_Rect* dst);