# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1284855396 25200
# Node ID 46fb637777edd465546add2a41f661b97fad3d74
# Parent  5002d6aeb85c868fa848cce2ba94c58cfbf0ac16
Here's the patch we use when building SDL-1.2.14 and 1.2-hg on Haiku,
it only affects Haiku specific files so should be ok to apply in hg.

-Scott McCreary
HaikuPorts

diff -r 5002d6aeb85c -r 46fb637777ed src/main/beos/SDL_BeApp.cc
--- a/src/main/beos/SDL_BeApp.cc	Fri Jul 09 17:19:18 2010 +0200
+++ b/src/main/beos/SDL_BeApp.cc	Sat Sep 18 17:16:36 2010 -0700
@@ -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 5002d6aeb85c -r 46fb637777ed src/video/bwindow/SDL_sysvideo.cc
--- a/src/video/bwindow/SDL_sysvideo.cc	Fri Jul 09 17:19:18 2010 +0200
+++ b/src/video/bwindow/SDL_sysvideo.cc	Sat Sep 18 17:16:36 2010 -0700
@@ -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 5002d6aeb85c -r 46fb637777ed src/video/bwindow/SDL_sysyuv.h
--- a/src/video/bwindow/SDL_sysyuv.h	Fri Jul 09 17:19:18 2010 +0200
+++ b/src/video/bwindow/SDL_sysyuv.h	Sat Sep 18 17:16:36 2010 -0700
@@ -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);