Re: [PR PATCH] [Updated] openttd: update to 13.1.

[Emru1 <Emru1@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]

There is an updated pull request by Emru1 against master on the void-packages repository

https://github.com/Emru1/void-packages openttd
https://github.com/void-linux/void-packages/pull/43962

openttd: update to 13.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture - amd64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openttd-43962.patch --]
[-- Type: text/x-diff, Size: 4149 bytes --]

From 95da92b947e62b07844a628b6f1b34c1ea0de854 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sat, 20 May 2023 13:04:15 +0200
Subject: [PATCH] openttd: update to 13.1.

---
 srcpkgs/openttd/template | 71 +++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..df65423c1092 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,68 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=1.10.3
-revision=6
-_gfxver=0.6.0
-_sfxver=0.2.3
+version=13.1
+revision=1
+_gfxver=7.1
+_sfxver=1.0.3
+_msxver=0.4.2
 create_wrksrc=yes
 build_wrksrc=openttd-$version
-build_style=gnu-configure
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_BINDIR=bin
+ -DCMAKE_INSTALL_DATADIR=/usr/share
+ -DCMAKE_INSTALL_DOCDIR=share/doc/openttd
+"
+
 hostmakedepends="pkg-config unzip tar"
-makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma-devel
- libxdg-basedir-devel"
-depends="hicolor-icon-theme"
+makedepends="SDL2-devel libcurl-devel freetype-devel fontconfig-devel
+ harfbuzz-devel icu-devel libpng-devel liblzma-devel fluidsynth-devel"
+depends="hicolor-icon-theme fluidsynth soundfont-fluid"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
-distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
+distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
  https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
- https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip"
-checksum="c11601ef547eb1f6d4f9a035bd19e0a760b47872ce7d9b4117aaa45ac377b53b
- d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774
- 6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02"
+ https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
+ https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
+checksum="5edf22d37035238285ef672a97d59e64280bebab23e584780834ccd6be0a58bb
+ 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
+ e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
+ 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
 CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
 
 post_extract() {
 	cd $wrksrc
 	bsdtar xf opengfx-${_gfxver}.tar
+	bsdtar xf opensfx-${_sfxver}.tar
+	bsdtar xf openmsx-${_msxver}.tar
 	rm opengfx-${_gfxver}.tar
+	rm opensfx-${_sfxver}.tar
+	rm openmsx-${_msxver}.tar
 }
 
-do_configure() {
-	./configure --prefix-dir=/usr \
-		--cc-build=gcc \
-		--cxx-build=g++ \
-		--binary-dir=bin \
-		--data-dir=share/openttd \
-		--doc-dir=share/doc/openttd \
-		--with-lzo2=${XBPS_CROSS_BASE}/usr/lib \
-		--binary-name=openttd \
-		--install-dir=${DESTDIR} \
-		--menu-name=OpenTTD \
-		--with-xdg-basedir
+post_build() {
+	cd $wrksrc
+	cp opengfx-${_gfxver}/*.grf openttd-${version}/build/baseset
+	cp opengfx-${_gfxver}/opengfx.obg openttd-${version}/build/baseset
+	cp opensfx-${_sfxver}/opensfx.* openttd-${version}/build/baseset
+	cp -r openmsx-${_msxver} openttd-${version}/build/baseset
 }
 
 post_install() {
-	vmkdir usr/share/openttd/data
-	vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data
-	vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data
-	vcopy ../opensfx-${_sfxver}/opensfx.* usr/share/openttd/data
 	vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx
 	vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx
+	vlicense ../openmsx-${_msxver}/license.txt LICENSE-msx
 	vdoc ../opengfx-${_gfxver}/readme.txt README-gfx
 	vdoc ../opensfx-${_sfxver}/readme.txt README-sfx
+	vdoc ../openmsx-${_msxver}/readme.txt README-msx
 }