adds makeobj-nightly recipe,

adds simutrans_pak64-nightly and simutrans_pak128-nightly recipes, updates simutrans_120.0.1, simutrans_nightly, simutrans_pak64-120.0.1, simutrans_pak128-2.5.2
2026-04-08 21:00:05 +02:00 · 2015-06-22 06:51:11 +02:00
parent e1cefa27f6
commit 966ecde570
8 changed files with 279 additions and 20 deletions
--- a/games-util/makeobj/makeobj-nightly.recipe
+++ b/games-util/makeobj/makeobj-nightly.recipe
@@ -0,0 +1,66 @@
+SUMMARY="Tool for creating Simutrans paksets"
+DESCRIPTION="Makeobj is a tool for graphics/pakset developers \
+and is not needed for playing the game.
+Makeobj joins both the image and the data files in a single \
+compressed pak-file that will then be read by the game engine."
+HOMEPAGE="http://www.simutrans.com"
+SRC_URI="svn://tron.yamagi.org/simutrans/simutrans/trunk \
+	--username=anon --password="
+SRC_FILENAME="simutrans-$portVersion"
+SOURCE_DIR="trunk"
+COPYRIGHT="1997-2004 Hj. Malthaner
+	2005-2015 The Simutrans Team"
+LICENSE="Artistic"
+REVISION="1"
+ARCHITECTURES="?x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+PATCHES="makeobj-$portVersion.patchset"
+PROVIDES="
+	makeobj$secondaryArchSuffix = $portVersion
+	cmd:makeobj$secondaryArchSuffix = 55.4
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	gcc_syslibs$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libsdl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:svn
+	cmd:autoreconf
+	cmd:aclocal
+	cmd:make
+	cmd:ld$secondaryArchSuffix
+	cmd:strip$secondaryArchSuffix
+	cmd:sdl_config$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	autoreconf configure.ac
+	runConfigure ./configure
+	make makeobj $jobArgs
+	strip makeobj/makeobj
+}
+
+INSTALL()
+{
+	fixPkgconfig
+	mkdir -p $binDir
+	cp -r makeobj/makeobj $binDir/
+}
--- a/games-util/makeobj/patches/makeobj-nightly.patchset
+++ b/games-util/makeobj/patches/makeobj-nightly.patchset
@@ -0,0 +1,76 @@
+From 03547db5cb4f0ee90d5fa739eabbc182c4445772 Mon Sep 17 00:00:00 2001
+From: none <user@shredder>
+Date: Fri, 29 May 2015 08:17:51 +0200
+Subject: adjust Makefile for Haiku x86_64 and prepare configure.ac for
+ enabling multithread in Haiku
+
+
+diff --git a/Makefile b/Makefile
+index aa0d57b..1df85ca 100644
+--- a/Makefile
+++ b/Makefile
+@@ -53,8 +53,7 @@ else
+     else
+ # Haiku (needs to activate the GCC 4x)
+       ifeq ($(OSTYPE),haiku)
+-        setarch x86
+-        LIBS += -lnetwork -lbe -llocale
+        LIBS += -lnetwork -lbe
+       endif
+     endif
+   endif
+@@ -114,7 +113,9 @@ ifneq ($(MULTI_THREAD),)
+ #use lpthreadGC2d for debug alternatively
+       LDFLAGS += -lpthreadGC2
+     else
+-      LDFLAGS += -lpthread
+      ifneq ($(OSTYPE),haiku)
+        LDFLAGS += -lpthread
+      endif
+     endif
+   endif
+ endif
+diff --git a/configure.ac b/configure.ac
+index 85d5afd..d1e9b83 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -16,7 +16,7 @@ AC_CHECK_LIB(bz2, BZ2_bzReadOpen, [], [AC_MSG_WARN([Error, libbz2 is missing!])]
+ AC_CHECK_LIB(freetype2, load_FT_font, [AC_SUBST(freetype2, '-DUSE_FREETYPE')], [AC_SUBST(freetype2, '')] )
+ 
+ # optional (but highly recommended) multithreading
+-AC_CHECK_LIB(pthread, pthread_mutex_destroy, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] )
+AC_SEARCH_LIBS(pthread_mutex_destroy, pthread, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] )
+ 
+ # find OS and backend by libs ...
+ AC_CHECK_LIB(SDL2, SDL_GetRenderDriverInfo)
+diff --git a/simsys.cc b/simsys.cc
+index e4dc228..2ef7bac 100644
+--- a/simsys.cc
+++ b/simsys.cc
+@@ -7,7 +7,9 @@
+ #ifdef __HAIKU__
+ #include <Message.h>
+ #include <LocaleRoster.h>
+#include <SupportDefs.h>
+ #define NO_UINT32_TYPES
+#define NO_UINT64_TYPES
+ #endif
+ 
+ #include "macros.h"
+diff --git a/simtypes.h b/simtypes.h
+index cedbbec..912e95d 100644
+--- a/simtypes.h
+++ b/simtypes.h
+@@ -131,7 +131,9 @@ typedef unsigned long       uint32;
+ #endif
+ #endif
+ typedef   signed long long  sint64;
+#ifndef NO_UINT64_TYPES
+ typedef unsigned long long  uint64;
+#endif
+ #ifdef _MSC_VER
+ #	define GCC_PACKED
+ #	define GCC_ALIGN(a)
+-- 
+1.8.3.4
+