Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Pavel Vinogradov (cf66c924d8a81a55b7567654f6e2636a05894dd8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Pavel Vinogradov (cf66c924d8a81a55b7567654f6e2636a05894dd8)
  • Date: Tue, 22 Aug 2023 05:04:51 +0000

GIT changes to master games grimoire by Pavel Vinogradov
<public AT sourcemaage.org>:

games-strategy-rts/openttd/BUILD | 9 +----
games-strategy-rts/openttd/CONFIGURE | 18 +++++++---
games-strategy-rts/openttd/DEPENDS | 60
+++++++++--------------------------
games-strategy-rts/openttd/DETAILS | 28 +++++++++++-----
games-strategy-rts/openttd/FINAL | 5 ++
games-strategy-rts/openttd/HISTORY | 20 +++++++++++
games-strategy-rts/openttd/INSTALL | 9 ++++-
games-strategy-rts/openttd/PREPARE | 5 ++
8 files changed, 89 insertions(+), 65 deletions(-)

New commits:
commit cf66c924d8a81a55b7567654f6e2636a05894dd8
Author: Stephane Fontaine <esselfe16 AT gmail.com>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

openttd: version bumped to 13.4

diff --git a/games-strategy-rts/openttd/BUILD
b/games-strategy-rts/openttd/BUILD
index 19ad996..e230067 100755
--- a/games-strategy-rts/openttd/BUILD
+++ b/games-strategy-rts/openttd/BUILD
@@ -1,6 +1,3 @@
-./configure --prefix-dir=${INSTALL_ROOT}/usr \
- --binary-dir=/games \
- --data-dir=/share/games/openttd \
- --man-dir=/share/man \
- $OPTS &&
-make
+iOPTS="${OPENTTD_DEDICATED} ${OPTS}" &&
+
+default_build
diff --git a/games-strategy-rts/openttd/CONFIGURE
b/games-strategy-rts/openttd/CONFIGURE
index ea36d9f..1eb136a 100755
--- a/games-strategy-rts/openttd/CONFIGURE
+++ b/games-strategy-rts/openttd/CONFIGURE
@@ -1,5 +1,13 @@
-config_query_option OPENTTD_OPTS \
- "Enable network support?" \
- y \
- "--with-network" \
- "--without-network"
+. "${GRIMOIRE}/CMAKE_CONFIGURE" &&
+
+persistent_remove OPENTTD_OPTS &&
+
+config_query_option OPENTTD_DEDICATED \
+ "Build dedicated (server, no GUI) version?" \
+ n \
+ "-DOPTION_DEDICATED=ON" \
+ "-DOPTION_DEDICATED=OFF" &&
+
+config_query_list OPENTTD_GAME_FILES \
+ "Which game files to use?" \
+ original opensource
diff --git a/games-strategy-rts/openttd/DEPENDS
b/games-strategy-rts/openttd/DEPENDS
index 40d5541..22cb14e 100755
--- a/games-strategy-rts/openttd/DEPENDS
+++ b/games-strategy-rts/openttd/DEPENDS
@@ -1,43 +1,17 @@
-optional_depends sdl \
- "--with-sdl" \
- "--without-sdl" \
- "SDL video driver" &&
-optional_depends allegro \
- "--with-allegro" \
- "--without-allegro" \
- "Allegro video driver" &&
-# This is _not_ tmidity the program, but libtimidity the
-# library.
-# Create a spell for that one and then we can depend on it.
-#optional_depends TIMIDITY \
-# --with-libtimidity \
-# --without-libtimidity \
-# "Enable MIDI music with TiMidity++" &&
-optional_depends libpng \
- "--with-png" \
- "--without-png" \
- "Enable screenshots using PNG" &&
-optional_depends zlib \
- "--with-zlib" \
- "--without-zlib" \
- "Enable zlib-compressed savegames" &&
-optional_depends xz-utils \
- --with-liblzma \
- --without-liblzma \
- "Enable LZMA-compressed savegames" &&
-optional_depends lzo \
- --with-liblzo2 \
- --without-liblzo2 \
- "Enabze LZO-compressed savegames" &&
-optional_depends freetype2 \
- "--with-freetype" \
- "--without-freetype" \
- "Enable freetype support" &&
-optional_depends fontconfig \
- "--with-fontconfig" \
- "--without-config" \
- "Enable fontconfig" &&
-optional_depends icu \
- "--with-icu" \
- "--without-icu" \
- "right-to-left text support"
+. "${GRIMOIRE}/CMAKE_DEPENDS" &&
+depends zlib &&
+depends lzo &&
+depends libpng &&
+depends xz-utils &&
+
+if [[ "$OPENTTD_DEDICATED" == "n" ]]; then
+ depends sdl2 &&
+ depends allegro &&
+ depends fluidsynth &&
+ depends freetype2 &&
+ depends fontconfig
+fi &&
+
+if [[ "$OPENTTD_GAME_FILES" == "opensource" ]]; then
+ depends unzip
+fi
diff --git a/games-strategy-rts/openttd/DETAILS
b/games-strategy-rts/openttd/DETAILS
index 3b025b2..071f493 100755
--- a/games-strategy-rts/openttd/DETAILS
+++ b/games-strategy-rts/openttd/DETAILS
@@ -1,12 +1,24 @@
+. "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=openttd
- VERSION=1.6.0
- SOURCE=$SPELL-$VERSION-source.tar.gz
+ VERSION=13.4
+ SOURCE=$SPELL-$VERSION-source.tar.xz
+
SOURCE_URL[0]=https://cdn.openttd.org/${SPELL}-releases/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:d235e6e094b2e3fda0cf58a2dce1e5d779654bee638def60f00da4e7c6443b00a6f3b204d5a63cf56e141074c8aa3700ce7e9f1b1eccbb5cd36260f1892ad501
+if [[ "$OPENTTD_GAME_FILES" == "opensource" ]]; then
+ SOURCE2=opengfx-7.1-all.zip
+ SOURCE3=opensfx-1.0.3-all.zip
+ SOURCE4=openmsx-0.4.2-all.zip
+ SOURCE2_URL[0]=https://cdn.openttd.org/opengfx-releases/7.1/${SOURCE2}
+ SOURCE3_URL[0]=https://cdn.openttd.org/opensfx-releases/1.0.3/${SOURCE3}
+ SOURCE4_URL[0]=https://cdn.openttd.org/openmsx-releases/0.4.2/${SOURCE4}
+
SOURCE2_HASH=sha512:89dbb5cb45f3d720290d78904611ee3173617d97f4f49176fb10949b7d78bb0348b1aa7e12743c0cf3834b09ed73c1e161e04ae7532f2baffe4f1259bc8df04c
+
SOURCE3_HASH=sha512:4a3f0d19efe97729a1918101b8cb59a01a84aae43e432d697c9ca9af38296e1de0665b705dba0b3a29b8b04df6629c98eb8690534c7e70566f573ce72cab30b0
+
SOURCE4_HASH=sha512:6fdcec91ffcfa68ef367ff1733011a472caeb53f26fe07623ac510db80890789475919192317e6d5cddd6f3acea5bd58d8b174c23d506efcbd868392e418ed2f
+fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://binaries.openttd.org/releases/${VERSION}/${SOURCE}
- WEB_SITE=http://www.openttd.org/
+ WEB_SITE=https://www.openttd.org/
ENTERED=20040708
-
SOURCE_HASH=sha512:d235e6e094b2e3fda0cf58a2dce1e5d779654bee638def60f00da4e7c6443b00a6f3b204d5a63cf56e141074c8aa3700ce7e9f1b1eccbb5cd36260f1892ad501
- LICENSE[0]=GPL
+ LICENSE[0]=GPL2
SHORT="Open source clone of Microprose 'Transport Tycoon Deluxe'"
cat << EOF
OpenTTD is modeled after the original Transport Tycoon game by
@@ -38,6 +50,6 @@ Significant enhancements
- build many trees on one tile
- bribe the town authority

-IMPORTANT! You need the files from the original WINDOWS version
-of Transport Tycoon Deluxe.
+IMPORTANT! If not using the opensource game files, you need the files from
the
+original WINDOWS version of Transport Tycoon Deluxe.
EOF
diff --git a/games-strategy-rts/openttd/FINAL
b/games-strategy-rts/openttd/FINAL
index 675a0a6..0ef6a6c 100755
--- a/games-strategy-rts/openttd/FINAL
+++ b/games-strategy-rts/openttd/FINAL
@@ -1,3 +1,4 @@
+if [[ "$OPENTTD_GAME_FILES" == "original" ]]; then
message "${PROBLEM_COLOR}Warning:${DEFAULT_COLOR}\n" \
" This game is dependant on non-free game data.\n" \
"\n" \
@@ -6,7 +7,9 @@
" ${MESSAGE_COLOR}sample.cat${DEFAULT_COLOR}\n" \
" ${MESSAGE_COLOR}*.grf${DEFAULT_COLOR}" \
"\n" \
- " Put these files into the
${MESSAGE_COLOR}/usr/share/games/openttd/data${DEFAULT_COLOR} directory.\n" \
+ " Put these files into the
${MESSAGE_COLOR}/usr/share/games/openttd/baseset${DEFAULT_COLOR}
directory.\n" \
"\n" \
" If you would also like the original music, put the files from
the ${MESSAGE_COLOR}gm/${DEFAULT_COLOR} dir\n" \
" into the
${MESSAGE_COLOR}/usr/share/games/openttd/gm${DEFAULT_COLOR} directory."
+ " See https://wiki.openttd.org/en/Manual/Installation for
official instructions."
+fi
diff --git a/games-strategy-rts/openttd/HISTORY
b/games-strategy-rts/openttd/HISTORY
index ace7e5f..6dcfcf2 100644
--- a/games-strategy-rts/openttd/HISTORY
+++ b/games-strategy-rts/openttd/HISTORY
@@ -1,3 +1,23 @@
+2023-08-21: Stephane Fontaine <esselfe16 AT gmail.com>
+ * DETAILS: version 13.4
+ Add opensource game files
+ Change from gz to xz tarball
+ Adjust warning about original files
+ Change license from GPL to GPL2
+ Use HTTPS links
+ Converted to cmake build system
+ * BUILD: converted to cmake
+ * CONFIGURE: added CMAKE_CONFIGURE, dropped OPENTTD_OPTS
+ Added dedicated and game files (original/open source) options
+ * INSTALL: switch to cmake and conditionally extract
+ opensource game files
+ * DEPENDS: zlib, libpng, lzo and xz-utils now required
+ Conditionally depend on sdl2, allegro, fluidsynth,
+ freetype and fontconfig if not building the dedicated version
+ Add depends on unzip if building with the opensource game files
+ Added CMAKE_DEPENDS
+ * PREPARE, FINAL: Add link to official openttd wiki
+
2016-04-09 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.6.0

diff --git a/games-strategy-rts/openttd/INSTALL
b/games-strategy-rts/openttd/INSTALL
index 6e42622..f71128a 100755
--- a/games-strategy-rts/openttd/INSTALL
+++ b/games-strategy-rts/openttd/INSTALL
@@ -1 +1,8 @@
-make install INSTALL:=1
+default_install &&
+
+if [[ "$OPENTTD_GAME_FILES" == "opensource" ]]; then
+ cd "${INSTALL_ROOT}/usr/share/games/openttd/baseset" &&
+ unpack_file 2
+ unpack_file 3
+ unpack_file 4
+fi
diff --git a/games-strategy-rts/openttd/PREPARE
b/games-strategy-rts/openttd/PREPARE
index 675a0a6..0ef6a6c 100755
--- a/games-strategy-rts/openttd/PREPARE
+++ b/games-strategy-rts/openttd/PREPARE
@@ -1,3 +1,4 @@
+if [[ "$OPENTTD_GAME_FILES" == "original" ]]; then
message "${PROBLEM_COLOR}Warning:${DEFAULT_COLOR}\n" \
" This game is dependant on non-free game data.\n" \
"\n" \
@@ -6,7 +7,9 @@
" ${MESSAGE_COLOR}sample.cat${DEFAULT_COLOR}\n" \
" ${MESSAGE_COLOR}*.grf${DEFAULT_COLOR}" \
"\n" \
- " Put these files into the
${MESSAGE_COLOR}/usr/share/games/openttd/data${DEFAULT_COLOR} directory.\n" \
+ " Put these files into the
${MESSAGE_COLOR}/usr/share/games/openttd/baseset${DEFAULT_COLOR}
directory.\n" \
"\n" \
" If you would also like the original music, put the files from
the ${MESSAGE_COLOR}gm/${DEFAULT_COLOR} dir\n" \
" into the
${MESSAGE_COLOR}/usr/share/games/openttd/gm${DEFAULT_COLOR} directory."
+ " See https://wiki.openttd.org/en/Manual/Installation for
official instructions."
+fi



  • [SM-Commit] GIT changes to master games grimoire by Pavel Vinogradov (cf66c924d8a81a55b7567654f6e2636a05894dd8), Pavel Vinogradov, 08/22/2023

Archive powered by MHonArc 2.6.24.

Top of Page