From 4bac31a61fa5b55092f6bfbae33209637f92b6e1 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Tue, 22 Dec 2009 03:50:38 +0000
Subject: [PATCH] Adding patch which allows allegro-4.4.0 to build. Saved old
 RC1 bep file for now.

---
 media-libs/allegro/allegro-4.4.0.bep          |  7 +-
 media-libs/allegro/allegro-4.4.0_RC1.bep      | 18 +++++
 .../allegro/patches/allegro-4.4.0.patch       | 67 +++++++++++++++++++
 3 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 media-libs/allegro/allegro-4.4.0_RC1.bep
 create mode 100644 media-libs/allegro/patches/allegro-4.4.0.patch

diff --git a/media-libs/allegro/allegro-4.4.0.bep b/media-libs/allegro/allegro-4.4.0.bep
index 436a8a3a2..80782689c 100644
--- a/media-libs/allegro/allegro-4.4.0.bep
+++ b/media-libs/allegro/allegro-4.4.0.bep
@@ -1,14 +1,13 @@
 DESCRIPTION="Allegro game programming library" 
 HOMEPAGE="http://alleg.sourceforge.net/" 
-SRC_URI="http://downloads.sourceforge.net/project/alleg/allegro-prerelease/4.4.0-rc1/allegro-4.4.0-RC1.tar.gz"
-CHECKSUM_MD5="62a822b0d64666d1057f4dbd93b97a6d"
+SRC_URI="http://downloads.sourceforge.net/project/alleg/allegro/4.4.0/allegro-4.4.0.tar.gz"
+CHECKSUM_MD5="8a0bd73f5225ba8961211a5c440ff45d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd allegro-4.4.0
-	fix.sh haiku
-	make obj/beos/asmdef.inc
+	cmake .
 	make
 }
 
diff --git a/media-libs/allegro/allegro-4.4.0_RC1.bep b/media-libs/allegro/allegro-4.4.0_RC1.bep
new file mode 100644
index 000000000..436a8a3a2
--- /dev/null
+++ b/media-libs/allegro/allegro-4.4.0_RC1.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="Allegro game programming library" 
+HOMEPAGE="http://alleg.sourceforge.net/" 
+SRC_URI="http://downloads.sourceforge.net/project/alleg/allegro-prerelease/4.4.0-rc1/allegro-4.4.0-RC1.tar.gz"
+CHECKSUM_MD5="62a822b0d64666d1057f4dbd93b97a6d"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd allegro-4.4.0
+	fix.sh haiku
+	make obj/beos/asmdef.inc
+	make
+}
+
+INSTALL {
+	cd allegro-4.4.0
+	make install
+}
diff --git a/media-libs/allegro/patches/allegro-4.4.0.patch b/media-libs/allegro/patches/allegro-4.4.0.patch
new file mode 100644
index 000000000..16ce69664
--- /dev/null
+++ b/media-libs/allegro/patches/allegro-4.4.0.patch
@@ -0,0 +1,67 @@
+diff -ur allegro-4.4.0/CMakeLists.txt allegro-4.4.0-haiku/CMakeLists.txt
+--- allegro-4.4.0/CMakeLists.txt	2009-12-20 15:47:59.000000000 -0700
++++ allegro-4.4.0-haiku/CMakeLists.txt	2009-12-21 20:43:57.000000000 -0700
+@@ -270,7 +270,17 @@
+     endif(COMPILER_GCC)
+ endif(APPLE)
+ 
+-if(UNIX AND NOT APPLE)
++if(BEOS)
++	if(CMAKE_SYSTEM_NAME STREQUAL Haiku)
++		set(ALLEGRO_HAIKU 1)
++	else(CMAKE_SYSTEM_NAME STREQUAL Haiku)
++		set(ALLEGRO_BEOS 1)
++	endif(CMAKE_SYSTEM_NAME STREQUAL Haiku)
++    set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy")
++    set(WFLAGS_C_ONLY "")
++endif(BEOS)
++
++if(UNIX AND NOT APPLE AND NOT BEOS)
+     set(ALLEGRO_UNIX 1)
+ endif()
+ 
+@@ -560,6 +570,13 @@
+         )
+ endif(WIN32)
+ 
++# -- Haiku/BeOS --
++
++if(BEOS)
++    list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES})
++    list(APPEND PLATFORM_LIBS game midi device)
++endif(BEOS)
++
+ # -- Mac OS X --
+ 
+ if(ALLEGRO_MACOSX)
+@@ -644,6 +661,9 @@
+ if(ALLEGRO_WITH_XWINDOWS)
+     add_headers("" include/xalleg.h)
+ endif(ALLEGRO_WITH_XWINDOWS)
++if(BEOS)
++    add_headers("" include/bealleg.h)
++endif(BEOS)
+ 
+ #-----------------------------------------------------------------------------#
+ #
+diff -ur allegro-4.4.0/cmake/FileList.cmake allegro-4.4.0-haiku/cmake/FileList.cmake
+--- allegro-4.4.0/cmake/FileList.cmake	2009-11-08 19:24:05.000000000 -0700
++++ allegro-4.4.0-haiku/cmake/FileList.cmake	2009-12-21 20:43:06.000000000 -0700
+@@ -207,7 +207,7 @@
+         src/beos/bmousapi.cpp
+         src/beos/bmousdrv.c
+         src/beos/bmouse.c
+-        src/beos/boverlay.c
++        src/beos/boverlay.cpp
+         src/beos/bsnd.c
+         src/beos/bsndapi.cpp
+         src/beos/bsnddrv.c
+@@ -218,7 +218,7 @@
+         src/beos/btimeapi.cpp
+         src/beos/btimedrv.c
+         src/beos/btimer.c
+-        src/beos/bwindow.c
++        src/beos/bwindow.cpp
+         src/beos/bwscreen.cpp
+         src/unix/ufile.c
+         src/misc/colconv.c