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

Fix for allegro-4.4.1.1 to build with gcc4, patch by drcouzelis with minor adjustments from michaelvoliveira.

Browse Source
This commit is contained in:
Scott McCreary
2010-09-20 07:01:17 +00:00
parent c0da94e82b
commit d381399bba
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-libs/allegro/allegro-4.4.1.1.bep
View File

@@ -8,7 +8,7 @@ DEPEND="media-libs/libvorbis >= 1.2.3
media-libs/libogg >= 1.1.4"
BUILD {
cd allegro-4.4.1.1
cmake .
cmake . -DINFODIR:=`finddir B_COMMON_DIRECTORY`/share/info
make
}

48
media-libs/allegro/patches/allegro-4.4.1.1.patch Normal file
View File

@@ -0,0 +1,48 @@
diff -Naur allegro-4.4.1.1/src/beos/bdwindow.cpp allegro-4.4.1.1-haiku/src/beos/bdwindow.cpp
--- allegro-4.4.1.1/src/beos/bdwindow.cpp 2008-10-21 01:03:43.042467328 +0000
+++ allegro-4.4.1.1-haiku/src/beos/bdwindow.cpp 2010-09-20 02:39:19.000000000 +0000
@@ -413,9 +413,9 @@
}
#ifdef ALLEGRO_NO_ASM
- bmp->read_bank = _be_gfx_bwindow_read_write_bank;
- bmp->write_bank = _be_gfx_bwindow_read_write_bank;
- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank;
+ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank;
+ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank;
+ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank;
#else
bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm;
bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm;
diff -Naur allegro-4.4.1.1/src/beos/bwindow.cpp allegro-4.4.1.1-haiku/src/beos/bwindow.cpp
--- allegro-4.4.1.1/src/beos/bwindow.cpp 2008-10-20 08:27:27.042467328 +0000
+++ allegro-4.4.1.1-haiku/src/beos/bwindow.cpp 2010-09-20 02:40:37.000000000 +0000
@@ -347,9 +347,9 @@
}
#ifdef ALLEGRO_NO_ASM
- bmp->read_bank = _be_gfx_bwindow_read_write_bank;
- bmp->write_bank = _be_gfx_bwindow_read_write_bank;
- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank;
+ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank;
+ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank;
+ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank;
#else
bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm;
bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm;
diff -Naur allegro-4.4.1.1/src/beos/bwscreen.cpp allegro-4.4.1.1-haiku/src/beos/bwscreen.cpp
--- allegro-4.4.1.1/src/beos/bwscreen.cpp 2008-10-20 08:27:27.042729472 +0000
+++ allegro-4.4.1.1-haiku/src/beos/bwscreen.cpp 2010-09-20 02:40:07.000000000 +0000
@@ -363,9 +363,9 @@
#ifdef ALLEGRO_NO_ASM
if (gfx_capabilities) {
- bmp->write_bank = be_gfx_bwindowscreen_read_write_bank;
- bmp->read_bank = be_gfx_bwindowscreen_read_write_bank;
- _screen_vtable.unwrite_bank = be_gfx_bwindowscreen_unwrite_bank;
+ bmp->write_bank = (void *)be_gfx_bwindowscreen_read_write_bank;
+ bmp->read_bank = (void *)be_gfx_bwindowscreen_read_write_bank;
+ _screen_vtable.unwrite_bank = (void *)be_gfx_bwindowscreen_unwrite_bank;
}
#else
if (gfx_capabilities) {