~olbohlen/oi-userland.git

parent: 5638649c | patch | commit | ignore whitespace

2019-12-07 707a8195b69f7c633f24f77ad9b7a3dc78eaad40

openttd: update to 1.9.3

2 files added

2 files modified

	components/games/openttd/game/Makefile	7 ●●●●● patch \| view \| raw \| blame \| history
	components/games/openttd/game/openttd-game.p5m	7 ●●●●● patch \| view \| raw \| blame \| history
	components/games/openttd/game/patches/03-Makefile.grf.in.patch	40 ●●●●● patch \| view \| raw \| blame \| history
	components/games/openttd/game/patches/04-endian_type.patch	10 ●●●●● patch \| view \| raw \| blame \| history

 components/games/openttd/game/Makefile

@@ -19,15 +19,14 @@
include ../../../../make-rules/shared-macros.mk

COMPONENT_NAME=        openttd
COMPONENT_VERSION=    1.8.0
COMPONENT_REVISION=    1
COMPONENT_VERSION=    1.9.3
COMPONENT_PROJECT_URL=    http://www.openttd.org/en/
COMPONENT_FMRI=        games/openttd/openttd-core
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC)-source.tar.xz
COMPONENT_ARCHIVE_HASH=    \
    sha256:c2d32d9d736d27202a020027a3729ae763f5432ae6f424891e57a4095eeb087f
COMPONENT_ARCHIVE_URL=    https://binaries.openttd.org/releases/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
    sha256:1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846
COMPONENT_ARCHIVE_URL=    https://proxy.binaries.openttd.org/openttd-releases/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    GPLv2
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
COMPONENT_SUMMARY=    OpenTTD is an open source simulation game based upon Transport Tycoon Deluxe

 components/games/openttd/game/openttd-game.p5m

@@ -12,6 +12,7 @@
#
# Copyright 2014 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
# Copyright 2018 Harry Liebel <hliebel@gmail.com>
# Copyright 2019 Solene Rapenne <solene@perso.pw>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -25,10 +26,10 @@

file path=usr/bin/openttd
file path=usr/share/doc/openttd/COPYING
file path=usr/share/doc/openttd/README.md
file path=usr/share/doc/openttd/changelog.txt
file path=usr/share/doc/openttd/known-bugs.txt
file path=usr/share/doc/openttd/multiplayer.txt
file path=usr/share/doc/openttd/readme.txt
file path=usr/share/icons/hicolor/128x128/apps/openttd.png
file path=usr/share/icons/hicolor/16x16/apps/openttd.png
file path=usr/share/icons/hicolor/256x256/apps/openttd.png
@@ -46,14 +47,17 @@
file path=usr/share/openttd/ai/compat_1.6.nut
file path=usr/share/openttd/ai/compat_1.7.nut
file path=usr/share/openttd/ai/compat_1.8.nut
file path=usr/share/openttd/ai/compat_1.9.nut
file path=usr/share/openttd/baseset/no_music.obm
file path=usr/share/openttd/baseset/no_sound.obs
file path=usr/share/openttd/baseset/openttd.grf
file path=usr/share/openttd/baseset/opntitle.dat
file path=usr/share/openttd/baseset/orig_dos.obg
file path=usr/share/openttd/baseset/orig_dos.obm
file path=usr/share/openttd/baseset/orig_dos.obs
file path=usr/share/openttd/baseset/orig_dos_de.obg
file path=usr/share/openttd/baseset/orig_extra.grf
file path=usr/share/openttd/baseset/orig_tto.obm
file path=usr/share/openttd/baseset/orig_win.obg
file path=usr/share/openttd/baseset/orig_win.obm
file path=usr/share/openttd/baseset/orig_win.obs
@@ -64,6 +68,7 @@
file path=usr/share/openttd/game/compat_1.6.nut
file path=usr/share/openttd/game/compat_1.7.nut
file path=usr/share/openttd/game/compat_1.8.nut
file path=usr/share/openttd/game/compat_1.9.nut
file path=usr/share/openttd/lang/afrikaans.lng
file path=usr/share/openttd/lang/arabic_egypt.lng
file path=usr/share/openttd/lang/basque.lng

 components/games/openttd/game/patches/03-Makefile.grf.in.patch

New file
@@ -0,0 +1,40 @@
--- openttd-1.9.3.orig/Makefile.grf.in    jeu. déc.  5 16:12:38 2019
+++ openttd-1.9.3/Makefile.grf.in    jeu. déc.  5 16:13:05 2019
@@ -67,16 +67,16 @@
 $(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/orig_extra.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
     $(E) '$(STAGE) Updating $(notdir $@)'
     $(Q) sed 's/^ORIG_EXTRA.GRF    = *[0-9a-f]*$$/ORIG_EXTRA.GRF    = '`$(MD5SUM) $(BIN_DIR)/orig_extra.grf | sed 's@ .*@@'`'/' $< > $@.tmp
-    $(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
+    $(Q) gawk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
     $(Q) rm $@.tmp
 
 $(BIN_DIR)/%.obs: $(BASESET_DIR)/%.obs $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
     $(E) '$(STAGE) Updating $(notdir $@)'
-    $(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
+    $(Q) gawk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
 
 $(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
     $(E) '$(STAGE) Updating $(notdir $@)'
-    $(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
+    $(Q) gawk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
 
 # Guard against trying to run GRFCODEC/NFORENUM without either being set.
 ifdef GRFCODEC
@@ -87,7 +87,7 @@
     $(E) '$(STAGE) Assembling openttd.nfo'
     $(Q)-mkdir -p $(OBJS_DIR)/sprites
     $(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
-    $(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/openttd.nfo > $(OBJS_DIR)/sprites/openttd.nfo
+    $(Q) gawk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/openttd.nfo > $(OBJS_DIR)/sprites/openttd.nfo
     $(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
     $(E) '$(STAGE) Compiling openttd.grf'
     $(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
@@ -98,7 +98,7 @@
     $(E) '$(STAGE) Assembling orig_extra.nfo'
     $(Q)-mkdir -p $(OBJS_DIR)/sprites
     $(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
-    $(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/orig_extra.nfo > $(OBJS_DIR)/sprites/orig_extra.nfo
+    $(Q) gawk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/orig_extra.nfo > $(OBJS_DIR)/sprites/orig_extra.nfo
     $(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/orig_extra.nfo
     $(E) '$(STAGE) Compiling orig_extra.grf'
     $(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/orig_extra.grf

 components/games/openttd/game/patches/04-endian_type.patch

New file
@@ -0,0 +1,10 @@
--- openttd-1.9.3/src/core/endian_type.hpp.orig    Sat Dec  7 16:53:57 2019
+++ openttd-1.9.3/src/core/endian_type.hpp    Sat Dec  7 16:54:26 2019
@@ -36,6 +36,7 @@
 #        define TTD_ENDIAN TTD_BIG_ENDIAN
 #    endif
 #elif !defined(TESTING)
+#    include <endian.h>
 #    include <sys/param.h>
 #    if __BYTE_ORDER == __LITTLE_ENDIAN
 #        define TTD_ENDIAN TTD_LITTLE_ENDIAN

			@@ -19,15 +19,14 @@
			include ../../../../make-rules/shared-macros.mk

			COMPONENT_NAME= openttd
			COMPONENT_VERSION= 1.8.0
			COMPONENT_REVISION= 1
			COMPONENT_VERSION= 1.9.3
			COMPONENT_PROJECT_URL= http://www.openttd.org/en/
			COMPONENT_FMRI= games/openttd/openttd-core
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC)-source.tar.xz
			COMPONENT_ARCHIVE_HASH= \
			sha256:c2d32d9d736d27202a020027a3729ae763f5432ae6f424891e57a4095eeb087f
			COMPONENT_ARCHIVE_URL= https://binaries.openttd.org/releases/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
			sha256:1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846
			COMPONENT_ARCHIVE_URL= https://proxy.binaries.openttd.org/openttd-releases/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
			COMPONENT_LICENSE= GPLv2
			COMPONENT_LICENSE_FILE= $(COMPONENT_NAME).license
			COMPONENT_SUMMARY= OpenTTD is an open source simulation game based upon Transport Tycoon Deluxe

			@@ -12,6 +12,7 @@
			#
			# Copyright 2014 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
			# Copyright 2018 Harry Liebel <hliebel@gmail.com>
			# Copyright 2019 Solene Rapenne <solene@perso.pw>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -25,10 +26,10 @@

			file path=usr/bin/openttd
			file path=usr/share/doc/openttd/COPYING
			file path=usr/share/doc/openttd/README.md
			file path=usr/share/doc/openttd/changelog.txt
			file path=usr/share/doc/openttd/known-bugs.txt
			file path=usr/share/doc/openttd/multiplayer.txt
			file path=usr/share/doc/openttd/readme.txt
			file path=usr/share/icons/hicolor/128x128/apps/openttd.png
			file path=usr/share/icons/hicolor/16x16/apps/openttd.png
			file path=usr/share/icons/hicolor/256x256/apps/openttd.png
			@@ -46,14 +47,17 @@
			file path=usr/share/openttd/ai/compat_1.6.nut
			file path=usr/share/openttd/ai/compat_1.7.nut
			file path=usr/share/openttd/ai/compat_1.8.nut
			file path=usr/share/openttd/ai/compat_1.9.nut
			file path=usr/share/openttd/baseset/no_music.obm
			file path=usr/share/openttd/baseset/no_sound.obs
			file path=usr/share/openttd/baseset/openttd.grf
			file path=usr/share/openttd/baseset/opntitle.dat
			file path=usr/share/openttd/baseset/orig_dos.obg
			file path=usr/share/openttd/baseset/orig_dos.obm
			file path=usr/share/openttd/baseset/orig_dos.obs
			file path=usr/share/openttd/baseset/orig_dos_de.obg
			file path=usr/share/openttd/baseset/orig_extra.grf
			file path=usr/share/openttd/baseset/orig_tto.obm
			file path=usr/share/openttd/baseset/orig_win.obg
			file path=usr/share/openttd/baseset/orig_win.obm
			file path=usr/share/openttd/baseset/orig_win.obs
			@@ -64,6 +68,7 @@
			file path=usr/share/openttd/game/compat_1.6.nut
			file path=usr/share/openttd/game/compat_1.7.nut
			file path=usr/share/openttd/game/compat_1.8.nut
			file path=usr/share/openttd/game/compat_1.9.nut
			file path=usr/share/openttd/lang/afrikaans.lng
			file path=usr/share/openttd/lang/arabic_egypt.lng
			file path=usr/share/openttd/lang/basque.lng

New file
			@@ -0,0 +1,40 @@
			--- openttd-1.9.3.orig/Makefile.grf.in jeu. déc. 5 16:12:38 2019
			+++ openttd-1.9.3/Makefile.grf.in jeu. déc. 5 16:13:05 2019
			@@ -67,16 +67,16 @@
			$(BIN_DIR)/%.obg: $(BASESET_DIR)/%.obg $(BIN_DIR)/orig_extra.grf $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
			$(E) '$(STAGE) Updating $(notdir $@)'
			$(Q) sed 's/^ORIG_EXTRA.GRF = [0-9a-f]$$/ORIG_EXTRA.GRF = '`$(MD5SUM) $(BIN_DIR)/orig_extra.grf \| sed 's@ .*@@'`'/' $< > $@.tmp
			- $(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
			+ $(Q) gawk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $@.tmp >$@
			$(Q) rm $@.tmp

			$(BIN_DIR)/%.obs: $(BASESET_DIR)/%.obs $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
			$(E) '$(STAGE) Updating $(notdir $@)'
			- $(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
			+ $(Q) gawk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@

			$(BIN_DIR)/%.obm: $(BASESET_DIR)/%.obm $(OBJS_DIR)/langfiles.tmp $(BASESET_DIR)/translations.awk
			$(E) '$(STAGE) Updating $(notdir $@)'
			- $(Q) awk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@
			+ $(Q) gawk -v langfiles='$(OBJS_DIR)/langfiles.tmp' -f $(BASESET_DIR)/translations.awk $< >$@

			# Guard against trying to run GRFCODEC/NFORENUM without either being set.
			ifdef GRFCODEC
			@@ -87,7 +87,7 @@
			$(E) '$(STAGE) Assembling openttd.nfo'
			$(Q)-mkdir -p $(OBJS_DIR)/sprites
			$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
			- $(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/openttd.nfo > $(OBJS_DIR)/sprites/openttd.nfo
			+ $(Q) gawk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/openttd.nfo > $(OBJS_DIR)/sprites/openttd.nfo
			$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
			$(E) '$(STAGE) Compiling openttd.grf'
			$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
			@@ -98,7 +98,7 @@
			$(E) '$(STAGE) Assembling orig_extra.nfo'
			$(Q)-mkdir -p $(OBJS_DIR)/sprites
			$(Q)-cp $(PNG_FILES) $(OBJS_DIR)/sprites 2> /dev/null
			- $(Q) awk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/orig_extra.nfo > $(OBJS_DIR)/sprites/orig_extra.nfo
			+ $(Q) gawk -f $(GRF_DIR)/assemble_nfo.awk $(GRF_DIR)/orig_extra.nfo > $(OBJS_DIR)/sprites/orig_extra.nfo
			$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/orig_extra.nfo
			$(E) '$(STAGE) Compiling orig_extra.grf'
			$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/orig_extra.grf

New file
			@@ -0,0 +1,10 @@
			--- openttd-1.9.3/src/core/endian_type.hpp.orig Sat Dec 7 16:53:57 2019
			+++ openttd-1.9.3/src/core/endian_type.hpp Sat Dec 7 16:54:26 2019
			@@ -36,6 +36,7 @@
			# define TTD_ENDIAN TTD_BIG_ENDIAN
			# endif
			#elif !defined(TESTING)
			+# include <endian.h>
			# include <sys/param.h>
			# if __BYTE_ORDER == __LITTLE_ENDIAN
			# define TTD_ENDIAN TTD_LITTLE_ENDIAN