Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 396189 - games-simulation/simutrans-112.1 version bump
Summary: games-simulation/simutrans-112.1 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Games (show other bugs)
Hardware: All Linux
: Normal enhancement with 2 votes (vote)
Assignee: Gentoo Games
URL: http://www.simutrans.com/download.htm
Whiteboard:
Keywords: EBUILD
: 376543 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-12-27 11:26 UTC by Ivan S. Titov
Modified: 2013-01-22 23:52 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
ebuild for current version 111.1 (simutrans-0.111.1.ebuild,2.15 KB, text/plain)
2012-01-26 08:59 UTC, Florian E. Teply
Details
fixed ebuild (simutrans-0.111.1.ebuild,2.14 KB, text/plain)
2012-01-26 09:54 UTC, Florian E. Teply
Details
ebuild v0.111.2.2 (simutrans-0.111.2.2.ebuild,2.28 KB, text/plain)
2012-06-16 14:24 UTC, Daniel Bumke
Details
Patch to prevent build failure in csv.cc (simutrans-0.111.2.2-csv-include.patch,252 bytes, patch)
2012-06-16 14:25 UTC, Daniel Bumke
Details | Diff
Updated ebuild for Verseion 0.111.2.2 (simutrans-0.111.2.2-r1.ebuild,3.78 KB, text/plain)
2012-06-27 11:58 UTC, Volker R. Müller
Details
Ebuild for recent version 111.3.1 (simutrans-0.111.3.1.ebuild,5.48 KB, text/plain)
2012-08-11 14:06 UTC, Carsten Milkau
Details
Ebuild for complete version 110.0.1 (simutrans-0.110.0.1.ebuild,5.52 KB, text/plain)
2012-08-11 14:08 UTC, Carsten Milkau
Details
Ebuild for Simutrans V 0.112.1 (simutrans-0.112.1.ebuild,3.85 KB, text/plain)
2013-01-06 17:27 UTC, Volker R. Müller
Details
metadata.xml for 112-1 (metadata.xml,539 bytes, text/plain)
2013-01-06 17:28 UTC, Volker R. Müller
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ivan S. Titov 2011-12-27 11:26:28 UTC
Please, bump games-simulation/simutrans-111

Reproducible: Always
Comment 1 Florian E. Teply 2012-01-26 08:59:24 UTC
Created attachment 299929 [details]
ebuild for current version 111.1

The ebuild is a slightly adapted version from the one in kork overlay, adding support for ppc and reflecting the newest available versions of both the game itself as well as the pak128 pakset.

I'm not sure how to handle the additional define "-DUSE_C", which is needed on every arch non-x86 in order to use C stuff for some copying instead of x86 assembly. Right now it's an additional if statement per arch, but might be substituted by "if use !x86" or by using "-DUSE_C" universally even on x86.

It also reflects the default build subtree location build/default/ within the source directory.

Another comment on the addons/paksets: I'm not sure whether these should be placed in the game ebuild or separated into their own ebuild, either all-in-one with loads of use-flags or one ebuild per addon/pakset.
Comment 2 Florian E. Teply 2012-01-26 09:54:39 UTC
Created attachment 299937 [details]
fixed ebuild

fixed naming of zipfile for the food-addon
Comment 3 Ivan S. Titov 2012-04-17 11:39:55 UTC
ISimutrans bumped to 111.2.2
Comment 4 Daniel Bumke 2012-06-16 14:23:37 UTC
0.111.2.2 builds and runs fine with the following changes:

--- simutrans-0.111.1.ebuild    2012-06-16 13:36:04.406764068 +0100
+++ simutrans-0.111.2.2.ebuild  2012-06-16 15:04:19.426558572 +0100
@@ -7,9 +7,10 @@

 MY_PV=${PV/0./}
 MY_PV=${MY_PV//./-}
-MY_FOOD_PV=${MY_PV/%-2/-1}
-MY_128_SV=111.0
-MY_128_PV=2.0.0--${MY_128_SV%.2}
+MY_64_PV=111-2
+MY_FOOD_PV=111-1
+MY_128_SV=111.2
+MY_128_PV=2.1.0--${MY_128_SV}
 MY_SRCFRG="http://sourceforge.net/projects/${PN}/files"

 DESCRIPTION="A free Transport Tycoon clone"
@@ -18,8 +19,8 @@
 SRC_URI="
        ${MY_SRCFRG}/simutrans/${MY_PV}/simutrans-src-${MY_PV}.zip/download -> simutrans-src-${MY_PV}.zip
        ${MY_SRCFRG}/simutrans/${MY_PV}/simulinux-${MY_PV}.zip/download -> simulinux-${MY_PV}.zip
-       ${MY_SRCFRG}/pak64/${MY_PV}/simupak64-${MY_PV}.zip/download -> simupak64-${MY_PV}.zip
-       ${MY_SRCFRG}/pak64/${MY_PV}/simupak64-food-${MY_PV}.zip/download -> simupak64-food-${MY_FOOD_PV}.zip
+       ${MY_SRCFRG}/pak64/${MY_64_PV}/simupak64-${MY_64_PV}.zip/download -> simupak64-${MY_64_PV}.zip
+       ${MY_SRCFRG}/pak64/${MY_FOOD_PV}/simupak64-food-${MY_FOOD_PV}.zip/download -> simupak64-food-${MY_FOOD_PV}.zip
        pak128? ( ${MY_SRCFRG}/pak128/pak128%20for%20${MY_128_SV//./-}/pak128-${MY_128_PV}.zip/download -> simupak128-${MY_128_PV}.zip )
        "

@@ -66,6 +67,9 @@
                || die "sed failed"

        rm -f simutrans/simutrans
+
+       # Fix compilation as per http://forum.simutrans.com/index.php?topic=9658.0      
+       epatch "${FILESDIR}"/${P}-csv-include.patch
 }

 src_install() {



--- utils/csv.cc.old    2012-03-18 21:10:39.000000000 +0000
+++ utils/csv.cc        2012-06-16 14:48:07.643645405 +0100
@@ -8,6 +8,7 @@
 #include <cstring>
 #include <stdio.h>
 #include <assert.h>
+#include <stdlib.h>

 #include "csv.h"
 #include "simstring.h"
Comment 5 Daniel Bumke 2012-06-16 14:24:52 UTC
Created attachment 315511 [details]
ebuild v0.111.2.2
Comment 6 Daniel Bumke 2012-06-16 14:25:40 UTC
Created attachment 315513 [details, diff]
Patch to prevent build failure in csv.cc
Comment 7 Diego Elio Pettenò (RETIRED) gentoo-dev 2012-06-26 14:13:00 UTC
*** Bug 376543 has been marked as a duplicate of this bug. ***
Comment 8 Volker R. Müller 2012-06-27 11:57:39 UTC
(In reply to comment #5)

added some other paksets (128german, 64german, 128Britain) to your version. Although 0.111.3 is out, i'd prefer to version bump to 111.2.2, because 0.111.3 crashes here from time to time, when using german language ... Maybe some problem with the paksets ...

diff:
--- simutrans-0.111.2.2.ebuild	2012-06-27 10:35:18.000000000 +0200
+++ simutrans-0.111.2.2-r1.ebuild	2012-06-27 13:51:46.000000000 +0200
@@ -13,0 +14,7 @@
+
+MY_64DE_SV=110-0c
+MY_128DE_SV=111.2
+MY_128DE_PV=0.3_${MY_128DE_SV}
+MY_128GB_SV=111-0
+MY_128GB_PV=1.11-111-2
+
@@ -25 +32,13 @@
-	"
+
+	pak64german? (
+		${MY_SRCFRG}/pak.german/pak64.german-${MY_64DE_SV}/simupak-german64-${MY_64DE_SV}.zip/download -> simupak-german64-${MY_64DE_SV}.zip
+		${MY_SRCFRG}/pak.german/pak64.german-${MY_64DE_PV}/simutrans-german64-addons-${MY_64DE_SV/c/}.zip/download -> simutrans-german64-addons-${MY_64DE_SV/c/}.zip
+		${MY_SRCFRG}/pak.german/pak64.german-${MY_64DE_PV}/simupak-german64-industry-${MY_64DE_SV/c/}.zip/download -> simupak-german64-industry-${MY_64DE_SV/c/}.zip
+	)
+
+	pak128german? ( ${MY_SRCFRG}/PAK128.german/PAK128.german_${MY_128DE_SV}/PAK128.german_${MY_128DE_PV}.zip/download -> PAK128.german_${MY_128DE_PV}.zip )
+
+	pak128britain? (
+		${MY_SRCFRG}/pak128.britain/pak128.Britain%20for%20${MY_128GB_SV}/pak128.Britain.${MY_128GB_PV}.zip/download -> pak128.Britain.${MY_128GB_PV}.zip
+	)
+"
@@ -30 +49,4 @@
-IUSE="+pak128"
+IUSE="+pak128 pak64german pak128german pak128britain"
+
+# do not look on gentoo-mirrors, these files are not there ..... (yet :)
+RESTRICT="primaryuri"
@@ -72,0 +95,15 @@
+
+	# rename some files for consistent naming scheme
+	if use pak128britain ; then
+		mv pak128.Britain.111 simutrans/pak128.Britain
+	fi
+
+	if use pak128german ; then
+		mv simutrans/PAK128.german simutrans/pak128.German
+	fi
+
+	if use pak64german ; then
+		mv simutrans/pak64.german simutrans/pak64.German
+		mv simutrans/addons/pak64.german simutrans/addons/pak64.German
+	fi
+
@@ -82,0 +120,3 @@
+
+	elog "To install additional paksets add one of the following USE-Flags:  pak128 pak64german pak128german pak128britain"
+


Compiles fine and runs stable on amd64.
Comment 9 Volker R. Müller 2012-06-27 11:58:52 UTC
Created attachment 316413 [details]
Updated ebuild for Verseion 0.111.2.2

addes some more graphicel addons (paksets)
Comment 10 Carsten Milkau 2012-08-11 14:06:48 UTC
Created attachment 321010 [details]
Ebuild for recent version 111.3.1

Updated ebuild for v111.3.1. Many paksets arent available yet for that version, but some already are.
Comment 11 Carsten Milkau 2012-08-11 14:08:44 UTC
Created attachment 321014 [details]
Ebuild for complete version 110.0.1

I'll also add an ebuild for version 110.0.1, which enjoys much better pakset support than any of the 111.* versions so far.
Comment 12 Volker R. Müller 2013-01-06 17:27:38 UTC
Created attachment 334678 [details]
Ebuild for Simutrans V 0.112.1
Comment 13 Volker R. Müller 2013-01-06 17:28:17 UTC
Created attachment 334680 [details]
metadata.xml for 112-1
Comment 14 Volker R. Müller 2013-01-06 17:56:02 UTC
(In reply to comment #12)
> Created attachment 334678 [details]
> Ebuild for Simutrans V 0.112.1

Fogot to write: compiles & runs fine on amd64, not tested on x86 and ppc
Comment 15 Mr. Bones. (RETIRED) gentoo-dev 2013-01-22 22:33:52 UTC
games-simulation/simutrans-112.1 is in portage.