GemRB: bump (#2412)

* GemRB: bump * Cleanup * SOURCE_FILENAME
2026-04-09 05:10:05 +02:00 · 2018-04-26 06:07:57 +02:00
parent 555323b5cd
commit 96519c0cab
4 changed files with 131 additions and 78 deletions
--- a/games-engines/gemrb/gemrb-0.8.1.recipe
+++ b/games-engines/gemrb/gemrb-0.8.1.recipe
@@ -1,54 +0,0 @@
-SUMMARY="An infinite game engine generator"
-DESCRIPTION="GemRB (Game Engine Made with preRendered Background) \
-is a port (actually a new implementation) of the original Infinity \
-Engine (the one of Baldur's Gate, Icewind Dale, Planescape: Torment, ...) \
-to Linux/Unix, MacOS X and Windows with some enhancements. Would \
-you like to create a game like Baldur's Gate?"
-HOMEPAGE="https://github.com/gemrb/gemrb"
-COPYRIGHT="2003-2010 The GemRB Team"
-LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="https://github.com/gemrb/gemrb/archive/v0.8.1.tar.gz"
-CHECKSUM_SHA256="02e7d70f5f3f37d424a3bd2ceb705b8d532fb58d5a1da0a88fb20bc1b67e11b1"
-SOURCE_DIR="gemrb-$portVersion"
-PATCHES="gemrb_x86-0.8.1.patchset"
-
-ARCHITECTURES="x86 x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	gemrb = $portVersion
-	app:gemrb = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libSDL_1.2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libutil$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libsdl_1.2$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:cmake
-	cmd:make
-	cmd:python
-	"
-
-BUILD()
-{
-        mkdir -p build
-        cd build
-        cmake -DPREFIX=$appsDir ../
-        make $jobArgs
-}
-
-INSTALL()
-{
-        cd build
-        make install
-}
--- a/games-engines/gemrb/gemrb-0.8.5.recipe
+++ b/games-engines/gemrb/gemrb-0.8.5.recipe
@@ -0,0 +1,84 @@
+SUMMARY="An infinite game engine generator"
+DESCRIPTION="GemRB (Game Engine Made with preRendered Background) \
+is a port (actually a new implementation) of the original Infinity \
+Engine (the one of Baldur's Gate, Icewind Dale, Planescape: Torment, ...) \
+to Linux/Unix, MacOS X and Windows with some enhancements. Would \
+you like to create a game like Baldur's Gate?"
+HOMEPAGE="https://github.com/gemrb/gemrb"
+COPYRIGHT="2003-2017 The GemRB Team"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://github.com/gemrb/gemrb/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="d927e1eebd13a4643db363087fc61c5d2242e8a614da261f15bf4e2b1d94965c"
+SOURCE_FILENAME="gemrb-$portVersion.tar.gz"
+PATCHES="gemrb-$portVersion.patchset"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	gemrb$secondaryArchSuffix = $portVersion
+	cmd:extend2da.py$secondaryArchSuffix = $portVersion
+	cmd:gemrb$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libopenal$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libsdl_mixer$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libopenal$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libSDL$secondaryArchSuffix
+	devel:libsdl_mixer$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:cmake
+	cmd:make
+	cmd:python
+	"
+
+GLOBAL_WRITABLE_FILES="
+	settings/gemrb/GemRB.cfg.noinstall.sample keep-old
+	settings/gemrb/GemRB.cfg.sample keep-old
+	"
+
+defineDebugInfoPackage gemrb$secondaryArchSuffix \
+	"$binDir"/gemrb
+
+BUILD()
+{
+	mkdir -p build
+	cd build
+
+	cmake .. \
+		$cmakeDirArgs \
+		-Wno-dev
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	# Just icons
+	rm -rf $prefix/share
+}
--- a/games-engines/gemrb/patches/gemrb-0.8.5.patchset
+++ b/games-engines/gemrb/patches/gemrb-0.8.5.patchset
@@ -0,0 +1,47 @@
+From 91cc2f67a24e4648e151ec9034c7e8efc57f5b80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Mon, 2 Apr 2018 19:08:54 +0200
+Subject: Haiku install paths
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5d2017..842a92c 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -63,6 +63,8 @@ ENDIF(PREFIX)
+ if (NOT LAYOUT)
+ 	if (WIN32)
+ 		set(LAYOUT "home")
+	elseif (HAIKU)
+		set(LAYOUT "haiku")
+ 	elseif (APPLE)
+ 		set(LAYOUT "bundle")
+ 		# favor mac frameworks over unix libraries
+@@ -111,6 +113,24 @@ elseif (${LAYOUT} MATCHES "fhs")
+ 	SET_PATH( SVG_DIR ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps )
+ 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
+ 	SET_PATH( EXAMPLE_CONF_DIR ${SYSCONF_DIR} )
+elseif (${LAYOUT} MATCHES "haiku")
+	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/gemrb )
+	SET_PATH( PLUGIN_DIR ${LIB_DIR}/plugins )
+	SET_PATH( DATA_DIR ${CMAKE_INSTALL_PREFIX}/data/gemrb )
+	SET_PATH( MAN_DIR ${CMAKE_INSTALL_PREFIX}/documentation/man/man6 )
+	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
+	IF( NOT SYSCONF_DIR )
+		if ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" )
+			SET( SYSCONF_DIR /etc/gemrb )
+		else ()
+			SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/settings/gemrb )
+		endif ()
+	ENDIF( NOT SYSCONF_DIR )
+	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/documentation/gemrb )
+	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
+	SET_PATH( SVG_DIR ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps )
+	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
+	SET_PATH( EXAMPLE_CONF_DIR ${SYSCONF_DIR} )
+ elseif (${LAYOUT} MATCHES "opt")
+ 	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib )
+ 	SET_PATH( PLUGIN_DIR ${LIB_DIR}/plugins )
+-- 
+2.16.2
+
--- a/games-engines/gemrb/patches/gemrb_x86-0.8.1.patchset
+++ b/games-engines/gemrb/patches/gemrb_x86-0.8.1.patchset
@@ -1,24 +0,0 @@
-From 837d5f413216f4136a86d6dadf4efba56a07c078 Mon Sep 17 00:00:00 2001
-From: DarkmatterVale <valetolpegin@gmail.com>
-Date: Sat, 13 Dec 2014 19:53:47 +0000
-Subject: Fix Haiku build
- 
-NFD_OpenDialog
- 
-Haiku needs libbsd to use posix_openpty
- 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a54b37b..e81df43 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -369,6 +369,8 @@ MACRO(ADD_GEMRB_PLUGIN plugin_name)
-                        TARGET_LINK_LIBRARIES(${plugin_name} -shared-libgcc)
-                elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-                        TARGET_LINK_LIBRARIES(${plugin_name} -lc)
-+               elseif (CMAKE_SYSTEM_NAME STREQUAL "Haiku")
-+                       TARGET_LINK_LIBRARIES(${plugin_name} -lbsd)
-                endif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
-                INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR})
-        endif (STATIC_LINK)
--
-1.8.3.4