haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-29 11:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Previous patch file appears to be damaged, this one should be fixed.

Browse Source
This commit is contained in:
Scott McCreary
2008-09-12 10:59:44 +00:00
parent 9692eb30e6
commit 1df7ec68b8
1 changed files with 104 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
media-libs/allegro/allegro-4.3.10-haiku-4.diff
View File

@@ -1,6 +1,6 @@
diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/allegrogl/fix.sh
--- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 11:20:16.000000000 +0000
+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 03:20:16.000000000 -0800
+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-09-12 03:49:24.000000000 -0700
@@ -18,7 +18,7 @@
echo "Compilation target adjustment."
echo " Usage: fix <platform> [--dtou|--utod|--quick]"
@@ -19,8 +19,8 @@ diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/all
mingw32 ) proc_fix "Mingw32" "makefile.mgw";;
# used only by allegro's zipup.sh in packaging process
diff -urN allegro-4.3.10/addons/loadpng/Makefile.be allegro-4.3.10-haiku/addons/loadpng/Makefile.be
--- allegro-4.3.10/addons/loadpng/Makefile.be 1970-01-01 00:00:00.000000000 +0000
+++ allegro-4.3.10-haiku/addons/loadpng/Makefile.be 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/addons/loadpng/Makefile.be 1969-12-31 16:00:00.000000000 -0800
+++ allegro-4.3.10-haiku/addons/loadpng/Makefile.be 2008-09-12 03:49:24.000000000 -0700
@@ -0,0 +1,57 @@
+## Aux -*- Makefile -*- for BeOS/Haiku
+
@@ -80,8 +80,8 @@ diff -urN allegro-4.3.10/addons/loadpng/Makefile.be allegro-4.3.10-haiku/addons/
+veryclean: clean
+ - rm -f $(EXAMPLES) examples/saved.png
diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadpng/fix.sh
--- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-28 01:05:30.000000000 +0000
+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-27 17:05:30.000000000 -0800
+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-09-12 03:49:24.000000000 -0700
@@ -8,7 +8,7 @@
echo
echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
@@ -102,8 +102,8 @@ diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadp
"mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";;
"unix" ) proc_fix "Unix" "Makefile.unx";;
diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku/addons/logg/Makefile.be
--- allegro-4.3.10/addons/logg/Makefile.be 1970-01-01 00:00:00.000000000 +0000
+++ allegro-4.3.10-haiku/addons/logg/Makefile.be 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/addons/logg/Makefile.be 1969-12-31 16:00:00.000000000 -0800
+++ allegro-4.3.10-haiku/addons/logg/Makefile.be 2008-09-12 03:49:24.000000000 -0700
@@ -0,0 +1,43 @@
+PREFIX=`/boot/common/bin/allegro-config --prefix`
+CC=gcc
@@ -149,8 +149,8 @@ diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku/addons/log
+
+examples: play_ogg stream_ogg
diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix.sh
--- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 19:24:16.000000000 +0000
+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 11:24:16.000000000 -0800
+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-09-12 03:49:24.000000000 -0700
@@ -8,7 +8,7 @@
echo
echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
@@ -170,8 +170,8 @@ diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix
"mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";;
"unix" ) proc_fix "Unix" "Makefile.unix";;
diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh
--- allegro-4.3.10/fix.sh 2008-01-01 21:59:18.000000000 +0000
+++ allegro-4.3.10-haiku/fix.sh 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800
+++ allegro-4.3.10-haiku/fix.sh 2008-09-12 03:49:24.000000000 -0700
@@ -9,7 +9,7 @@
echo
echo "Usage: $0 <platform> [--quick|--dtou|--utod|--utom|--mtou]"
@@ -190,8 +190,8 @@ diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh
"mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";;
# The 'msvc' target is undocumented in the help message, but is used
diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h
--- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 22:37:14.000000000 +0000
+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-09-08 12:47:22.000000000 +0000
--- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 14:37:14.000000000 -0800
+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-09-12 03:49:24.000000000 -0700
@@ -189,7 +189,7 @@
@@ -202,8 +202,8 @@ diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku
AL_ARRAY(char *, _pckeys_names);
diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h
--- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 08:13:22.000000000 +0000
+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-09-08 12:47:22.000000000 +0000
--- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 01:13:22.000000000 -0700
+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-09-12 03:49:24.000000000 -0700
@@ -48,6 +48,8 @@
#include "allegro/platform/albcc32.h"
#elif defined ALLEGRO_MSVC
@@ -214,8 +214,8 @@ diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haik
#include "allegro/platform/albecfg.h"
#elif defined ALLEGRO_MPW
diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h
--- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-16 02:52:28.000000000 +0000
+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-09-08 12:47:22.000000000 +0000
--- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-15 19:52:28.000000000 -0700
+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-09-12 03:49:24.000000000 -0700
@@ -31,7 +31,12 @@
#define ALLEGRO_HAVE_SYS_TIME_H 1
@@ -231,15 +231,15 @@ diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku
#define ALLEGRO_CONSOLE_OK
#define ALLEGRO_USE_CONSTRUCTOR
diff -urN allegro-4.3.10/include/allegro/platform/alplatf.h allegro-4.3.10-haiku/include/allegro/platform/alplatf.h
--- allegro-4.3.10/include/allegro/platform/alplatf.h 2008-01-20 00:00:54.000000000 +0000
+++ allegro-4.3.10-haiku/include/allegro/platform/alplatf.h 2008-09-08 12:58:39.000000000 +0000
--- allegro-4.3.10/include/allegro/platform/alplatf.h 2008-01-19 16:00:54.000000000 -0800
+++ allegro-4.3.10-haiku/include/allegro/platform/alplatf.h 2008-09-12 03:49:24.000000000 -0700
@@ -1,2 +1,2 @@
/* generated by fix.sh */
-#define ALLEGRO_UNIX
+#define ALLEGRO_BEOS
diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
--- allegro-4.3.10/makefile.all 2008-01-14 11:55:28.000000000 +0000
+++ allegro-4.3.10-haiku/makefile.all 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800
+++ allegro-4.3.10-haiku/makefile.all 2008-09-12 03:49:24.000000000 -0700
@@ -8,7 +8,7 @@
# DEBUGMODE=2 selects a build intended to debug Allegro itself.
# PROFILEMODE=1 selects a profiling build.
@@ -259,8 +259,8 @@ diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES))))
diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be
--- allegro-4.3.10/makefile.be 2008-01-11 11:30:16.000000000 +0000
+++ allegro-4.3.10-haiku/makefile.be 2008-09-08 12:58:16.000000000 +0000
--- allegro-4.3.10/makefile.be 2008-01-11 03:30:16.000000000 -0800
+++ allegro-4.3.10-haiku/makefile.be 2008-09-12 03:49:24.000000000 -0700
@@ -10,7 +10,15 @@
# -------- define some variables that the primary makefile will use --------
@@ -307,8 +307,8 @@ diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be
chmod a+x /bin/allegro-config
diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh
--- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 21:45:48.000000000 +0000
+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800
+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-09-12 03:49:24.000000000 -0700
@@ -73,9 +73,9 @@
# Hack'n'slash
echo "Stripping to form end-user distribution"
@@ -338,11 +338,11 @@ diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdis
# logg addon
(cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat)
diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh
--- allegro-4.3.10/misc/zipup.sh 2008-01-19 12:16:56.000000000 +0000
+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-09-08 12:58:43.000000000 +0000
@@ -126,6 +126,30 @@
make depend UNIX_TOOLS=1 CC=gcc
--- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800
+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-09-12 03:44:23.000000000 -0700
@@ -125,6 +125,12 @@
make depend UNIX_TOOLS=1 CC=gcc
+# generate dependencies for Haiku
+echo "Generating Haiku dependencies..."
@@ -350,12 +350,10 @@ diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh
+./fix.sh haiku --quick
+
+make depend UNIX_TOOLS=1 CC=gcc
+
+
# generate dependencies for QNX
echo "Generating QNX dependencies..."
@@ -164,7 +188,7 @@
@@ -164,7 +170,7 @@
for base in abi ahack allegro const faq help mistakes; do
./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx
done
@@ -365,8 +363,8 @@ diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh
done
diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c
--- allegro-4.3.10/setup/keyconf.c 2005-04-07 23:37:20.000000000 +0000
+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/setup/keyconf.c 2005-04-07 16:37:20.000000000 -0700
+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-09-12 03:49:24.000000000 -0700
@@ -25,8 +25,8 @@
@@ -379,8 +377,8 @@ diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c
char *ascii_name[32] =
diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp
--- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 23:18:56.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 16:18:56.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -20,7 +20,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -391,8 +389,8 @@ diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/bacce
#endif
diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp
--- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 15:18:16.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 07:18:16.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -403,8 +401,8 @@ diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdis
#endif
diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp
--- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 20:57:00.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 13:57:00.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -21,7 +21,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -415,8 +413,8 @@ diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdw
#endif
diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c
--- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 16:05:12.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 08:05:12.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -430,8 +428,8 @@ diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c
diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp
--- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 21:12:30.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 13:12:30.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -442,8 +440,8 @@ diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfx
#endif
diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c
--- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -18,9 +18,9 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
@@ -457,8 +455,8 @@ diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdr
BEGIN_GFX_DRIVER_LIST
GFX_DRIVER_BEOS
diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c
--- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 17:16:42.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 09:16:42.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -469,8 +467,8 @@ diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c
#endif
diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp
--- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 14:44:50.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 07:44:50.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -484,8 +482,8 @@ diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoy
static BJoystick *be_joy = NULL;
static int32 num_devices, num_axes, num_hats, num_buttons;
diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c
--- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -18,9 +18,9 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
@@ -499,8 +497,8 @@ diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydr
BEGIN_JOYSTICK_DRIVER_LIST
JOYSTICK_DRIVER_BEOS
diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c
--- allegro-4.3.10/src/beos/bkey.c 2004-12-03 20:56:28.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bkey.c 2004-12-03 12:56:28.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -514,8 +512,8 @@ diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c
diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp
--- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 20:57:00.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 13:57:00.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -22,9 +22,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -529,8 +527,8 @@ diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkey
#define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie
diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c
--- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -18,9 +18,9 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
@@ -544,8 +542,8 @@ diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydr
_DRIVER_INFO _keyboard_driver_list[] =
{
diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c
--- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 15:05:34.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 07:05:34.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -559,8 +557,8 @@ diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c
MIDI_DRIVER midi_beos =
{
diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp
--- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 21:48:38.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 14:48:38.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -574,8 +572,8 @@ diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmi
BMidiSynth *_be_midisynth = NULL;
diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c
--- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -18,9 +18,9 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
@@ -589,8 +587,8 @@ diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmidi
BEGIN_MIDI_DRIVER_LIST
MIDI_DRIVER_BEOS
diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp
--- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 20:57:00.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 13:57:00.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -23,9 +23,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -604,8 +602,8 @@ diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmo
#define MOUSE_THREAD_NAME "mouse driver"
#define MOUSE_THREAD_PRIORITY 60
diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c
--- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -18,9 +18,9 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
@@ -619,8 +617,8 @@ diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmous
diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c
--- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 13:24:16.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 05:24:16.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -634,8 +632,8 @@ diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.
diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp
--- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 11:53:40.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 03:53:40.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -646,8 +644,8 @@ diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/bov
#endif
diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c
--- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 15:05:34.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 07:05:34.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -661,8 +659,8 @@ diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c
DIGI_DRIVER digi_beos =
{
diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp
--- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 15:05:34.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 07:05:34.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -20,7 +20,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -673,8 +671,8 @@ diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsnd
#endif
diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c
--- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,9 +19,9 @@
#include "allegro/internal/aintern.h"
@@ -688,8 +686,8 @@ diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddr
BEGIN_DIGI_DRIVER_LIST
DIGI_DRIVER_BEOS
diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp
--- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 20:57:00.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 13:57:00.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -27,9 +27,9 @@
#include <sys/utsname.h>
#endif
@@ -703,8 +701,8 @@ diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsys
#define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY
#define SYS_THREAD_NAME "system driver"
diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c
--- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -18,9 +18,9 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
@@ -718,8 +716,8 @@ diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdr
_DRIVER_INFO _system_driver_list[] =
{
diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c
--- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 21:10:58.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 13:10:58.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,11 +19,9 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -735,8 +733,8 @@ diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsyste
SYSTEM_DRIVER system_beos = {
SYSTEM_BEOS,
diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp
--- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 11:33:22.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 04:33:22.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -747,8 +745,8 @@ diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/bti
#endif
diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c
--- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 15:30:48.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 07:30:48.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-09-12 03:49:24.000000000 -0700
@@ -18,9 +18,9 @@
#include "allegro.h"
#include "allegro/internal/aintern.h"
@@ -762,8 +760,8 @@ diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btime
_DRIVER_INFO _timer_driver_list[] = {
{TIMER_BEOS, &timer_beos, TRUE},
diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c
--- allegro-4.3.10/src/beos/btimer.c 2004-08-22 02:57:14.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/btimer.c 2004-08-21 19:57:14.000000000 -0700
+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -774,8 +772,8 @@ diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.
#endif
diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp
--- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 11:53:40.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 03:53:40.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -786,8 +784,8 @@ diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwin
#endif
diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp
--- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 17:27:02.000000000 +0000
+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 09:27:02.000000000 -0800
+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-09-12 03:49:24.000000000 -0700
@@ -19,7 +19,7 @@
#include "allegro/internal/aintern.h"
#include "allegro/platform/aintbeos.h"
@@ -798,8 +796,8 @@ diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bws
#endif
diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmdefs.inc
--- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-16 02:52:28.000000000 +0000
+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-15 19:52:28.000000000 -0700
+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-09-12 03:49:24.000000000 -0700
@@ -31,6 +31,8 @@
#include "obj/msvc/asmdef.inc"
#elif defined ALLEGRO_WATCOM
@@ -810,8 +808,8 @@ diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmd
#include "obj/beos/asmdef.inc"
#elif defined ALLEGRO_QNX
diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c
--- allegro-4.3.10/src/midi.c 2007-04-12 16:19:54.000000000 +0000
+++ allegro-4.3.10-haiku/src/midi.c 2008-09-08 12:58:19.000000000 +0000
--- allegro-4.3.10/src/midi.c 2007-04-12 09:19:54.000000000 -0700
+++ allegro-4.3.10-haiku/src/midi.c 2008-09-12 03:49:24.000000000 -0700
@@ -1122,7 +1122,7 @@
running_status = 0;
@@ -822,8 +820,8 @@ diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c
{ int i; for (i=1; i; i--); }
#endif
diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
--- allegro-4.3.10/tools/dat2c.c 2005-04-28 09:53:38.000000000 +0000
+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700
+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-09-12 03:49:24.000000000 -0700
@@ -342,7 +342,7 @@
}
@@ -834,8 +832,8 @@ diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
#elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
dat2c->lformat = lineformat_dos;
diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c
--- allegro-4.3.10/tools/datedit.c 2007-10-08 16:23:36.000000000 +0000
+++ allegro-4.3.10-haiku/tools/datedit.c 2008-09-08 12:47:21.000000000 +0000
--- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700
+++ allegro-4.3.10-haiku/tools/datedit.c 2008-09-12 03:49:24.000000000 -0700
@@ -121,6 +121,8 @@
#include "obj/dmc/plugins.h"
#elif defined ALLEGRO_BEOS
@@ -846,8 +844,8 @@ diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c
#include "obj/bcc32/plugins.h"
#elif defined ALLEGRO_MPW
diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku/tools/grabber.c
--- allegro-4.3.10/tools/grabber.c 2006-07-24 13:09:26.000000000 +0000
+++ allegro-4.3.10-haiku/tools/grabber.c 2008-09-08 12:58:49.000000000 +0000
--- allegro-4.3.10/tools/grabber.c 2006-07-24 06:09:26.000000000 -0700
+++ allegro-4.3.10-haiku/tools/grabber.c 2008-09-12 03:49:24.000000000 -0700
@@ -3132,6 +3132,7 @@
case OSTYPE_QNX: s = "QNX"; break;
case OSTYPE_UNIX: s = "Unix"; break;