mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
simutrans, remove older recipes (#5966)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,85 +0,0 @@
|
||||
From 63efd2c2a2d1c45b8abdfbc0f4d76701dd2929c5 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 edit configure.sh script to
|
||||
search for pthread in order to enable multithreading in Haiku
|
||||
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0677ef0..90640ee 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -57,8 +57,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
|
||||
@@ -118,7 +117,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.sh b/configure.sh
|
||||
index 918935f..9ddd40d 100644
|
||||
--- a/configure.sh
|
||||
+++ b/configure.sh
|
||||
@@ -4221,13 +4221,12 @@ fi
|
||||
|
||||
|
||||
# optional (but highly recommended) multithreading
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_destroy in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_mutex_destroy in -lpthread... " >&6; }
|
||||
-if ${ac_cv_lib_pthread_pthread_mutex_destroy+:} false; then :
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutex_destroy" >&5
|
||||
+$as_echo_n "checking for library containing pthread_mutex_destroy... " >&6; }
|
||||
+if ${ac_cv_search_pthread_mutex_destroy+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+ ac_func_search_save_LIBS=$LIBS
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
diff --git a/simsys.cc b/simsys.cc
|
||||
index 49a1e26..9764f9e 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 b4ab8d2..b6cd4b2 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
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
SUMMARY="A transport simulation game"
|
||||
DESCRIPTION="Simutrans is an open-source transportation simulation game \
|
||||
available for Windows, Mac, Linux and BeOS. Your goal is to establish a \
|
||||
successful transport company and build the necessary infrastructure to \
|
||||
transport passengers, mail and goods between cities, factories and \
|
||||
touristic attractions by land, air and water."
|
||||
HOMEPAGE="http://www.simutrans.com"
|
||||
COPYRIGHT="1997-2004 Hj. Malthaner
|
||||
2005-2014 The Simutrans Team"
|
||||
LICENSE="Artistic"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://sourceforge.net/projects/simutrans/files/simutrans/120-0-1/simutrans-src-120-0-1.zip"
|
||||
CHECKSUM_SHA256="010a6e3765891e1821364e54f6bcdfb2911b627ffca3acae8350e06e53113683"
|
||||
SOURCE_FILENAME="simutrans-$portVersion.zip"
|
||||
SOURCE_DIR=""
|
||||
PATCHES="simutrans-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
non-packaged/$relativeAppsDir/simutrans/config directory keep-old
|
||||
"
|
||||
|
||||
PROVIDES="
|
||||
simutrans$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
simutrans_pakset == $portVersion
|
||||
timgmsoundfont
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libpng$secondaryArchSuffix
|
||||
lib:libsdl$secondaryArchSuffix
|
||||
lib:libsdl_mixer$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libpng$secondaryArchSuffix
|
||||
devel:libsdl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:git
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:strip$secondaryArchSuffix
|
||||
cmd:svn
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
chmod +x configure.sh
|
||||
runConfigure ./configure.sh
|
||||
make $jobArgs
|
||||
strip sim
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
fixPkgconfig
|
||||
cp sim simutrans/simutrans
|
||||
mkdir -p $appsDir/simutrans
|
||||
mkdir -p $prefix/non-packaged/$relativeAppsDir/simutrans/config
|
||||
cp -r simutrans $appsDir/
|
||||
mv $appsDir/simutrans/config \
|
||||
$prefix/non-packaged/$relativeAppsDir/simutrans/
|
||||
ln -s $prefix/non-packaged/$relativeAppsDir/simutrans/config \
|
||||
$appsDir/simutrans/config
|
||||
|
||||
addAppDeskbarSymlink $appsDir/simutrans/simutrans "Simutrans"
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
SUMMARY="A transport simulation game"
|
||||
DESCRIPTION="Simutrans is a freeware and open-source transportation \
|
||||
simulator. Your goal is to establish a successful transport company. \
|
||||
Transport passengers, mail and goods by rail, road, ship, and even air. \
|
||||
Interconnect districts, cities, public buildings, industries and \
|
||||
tourist attractions by building a transport network you always dreamed \
|
||||
of."
|
||||
HOMEPAGE="http://www.simutrans.com"
|
||||
COPYRIGHT="1997-2004 Hj. Malthaner
|
||||
2005-2017 The Simutrans Team"
|
||||
LICENSE="Artistic"
|
||||
REVISION="1"
|
||||
SvnRevision="8162"
|
||||
GitRevision="fb14bfcef06f3c15e0cc5d8368a0bdfe411de65d"
|
||||
SOURCE_URI="https://github.com/aburch/simutrans/archive/$GitRevision.tar.gz"
|
||||
CHECKSUM_SHA256="7a9c6c2318c0098c84d58518248761d57f34bdbaabbaae5f66d16c3aed1a2227"
|
||||
SOURCE_FILENAME="simutrans-$portVersion.tar.gz"
|
||||
SOURCE_DIR="simutrans-$GitRevision"
|
||||
SOURCE_URI_2="https://downloads.sourceforge.net/project/simutrans/simutrans/120-2-2/simutrans-src-120-2-2.zip"
|
||||
CHECKSUM_SHA256_2="7f22c144377abf1a0ee49432f3f6f5eb9a620567960df31d2ea6399b17cf26fa"
|
||||
SOURCE_FILENAME_2="simutrans-sf-$portVersion.zip"
|
||||
SOURCE_DIR_2=""
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
simutrans$secondaryArchSuffix = $portVersion
|
||||
app:simutrans$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
simutrans_pakset$secondaryArchSuffix >= 120.2
|
||||
timgmsoundfont
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libpng$secondaryArchSuffix
|
||||
lib:libsdl$secondaryArchSuffix
|
||||
lib:libsdl_mixer$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libpng$secondaryArchSuffix
|
||||
devel:libsdl$secondaryArchSuffix
|
||||
devel:libsdl_mixer$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoreconf
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:sdl_config$secondaryArchSuffix
|
||||
cmd:strip$secondaryArchSuffix
|
||||
"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
non-packaged/$relativeAppsDir/simutrans/config directory keep-old
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf configure.ac
|
||||
export CFLAGS+=-DREVISION=$SvnRevision
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
strip sim
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cp $sourceDir2/simutrans/text/*.tab simutrans/text/
|
||||
cp sim simutrans/simutrans
|
||||
mkdir -p $appsDir/simutrans
|
||||
mkdir -p $prefix/non-packaged/$relativeAppsDir/simutrans/config
|
||||
cp -r simutrans $appsDir/
|
||||
mv $appsDir/simutrans/config \
|
||||
$prefix/non-packaged/$relativeAppsDir/simutrans/
|
||||
ln -s $prefix/non-packaged/$relativeAppsDir/simutrans/config \
|
||||
$appsDir/simutrans/config
|
||||
|
||||
addAppDeskbarSymlink $appsDir/simutrans/simutrans "Simutrans"
|
||||
}
|
||||
Reference in New Issue
Block a user