From 51384b8280b60054f5d6ce980d3c1fe81568a0b8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 01:25:44 +0000 Subject: [PATCH] Changed BEOS cases in CMakeLists.txt to HAIKU, this fixes the Allegro build --- media-libs/allegro/allegro-4.4.2.recipe | 6 +-- media-libs/allegro/patches/Haiku.patch | 50 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 media-libs/allegro/patches/Haiku.patch diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 246807cef..84360f83b 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -21,8 +21,8 @@ COPYRIGHT="1998-2010 Shawn Hargreaves et al." REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" allegro$secondaryArchSuffix = $portVersion @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -#PATCHES="allegro-4.4.1.1.patchset" +PATCHES="Haiku.patch" BUILD() { diff --git a/media-libs/allegro/patches/Haiku.patch b/media-libs/allegro/patches/Haiku.patch new file mode 100644 index 000000000..bb6633253 --- /dev/null +++ b/media-libs/allegro/patches/Haiku.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 245be10..6ab68c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -291,7 +291,7 @@ if(APPLE) + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) + else(CMAKE_SYSTEM_NAME STREQUAL Haiku) +@@ -300,9 +300,9 @@ if(BEOS) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") + set(WFLAGS_C_ONLY "") + set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") +-endif(BEOS) ++endif(HAIKU) + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -628,10 +628,10 @@ endif(WIN32) + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif(HAIKU) + + # -- Mac OS X -- + +@@ -727,9 +727,9 @@ endif(WIN32) + if(ALLEGRO_WITH_XWINDOWS) + add_headers("" include/xalleg.h) + endif(ALLEGRO_WITH_XWINDOWS) +-if(BEOS) ++if(HAIKU) + add_headers("" include/bealleg.h) +-endif(BEOS) ++endif(HAIKU) + + #-----------------------------------------------------------------------------# + #