* [PR PATCH] openttd: update to 13.1.
@ 2023-05-20 13:13 Emru1
2023-05-20 13:15 ` [PR PATCH] [Updated] " Emru1
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: Emru1 @ 2023-05-20 13:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is a new 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: 4111 bytes --]
From 66fba0ec258ae8faa1a35a41adbc7a1527bd5620 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 | 67 ++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..0c8f75b841d4 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,26 +1,37 @@
# 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
+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"
CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
@@ -28,30 +39,26 @@ 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
@ 2023-05-20 13:15 ` Emru1
2023-05-21 17:05 ` Emru1
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-20 13:15 UTC (permalink / raw)
To: ml
[-- 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: 4108 bytes --]
From 36183c202626ba0358d46a28f787c02d4c84c713 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 | 67 ++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..39bdd7b5536b 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,26 +1,37 @@
# 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
+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"
CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
@@ -28,30 +39,26 @@ 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
2023-05-20 13:15 ` [PR PATCH] [Updated] " Emru1
@ 2023-05-21 17:05 ` Emru1
2023-05-21 17:26 ` Emru1
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-21 17:05 UTC (permalink / raw)
To: ml
[-- 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: 4127 bytes --]
From 458f13e8561d91d5b6c02554d35bd1ee35da74bb 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 | 68 ++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..4af5eb255576 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,26 +1,38 @@
# 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"
CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
@@ -28,30 +40,26 @@ 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
2023-05-20 13:15 ` [PR PATCH] [Updated] " Emru1
2023-05-21 17:05 ` Emru1
@ 2023-05-21 17:26 ` Emru1
2023-05-23 13:04 ` Emru1
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-21 17:26 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
` (2 preceding siblings ...)
2023-05-21 17:26 ` Emru1
@ 2023-05-23 13:04 ` Emru1
2023-05-27 18:12 ` Emru1
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-23 13:04 UTC (permalink / raw)
To: ml
[-- 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: 4108 bytes --]
From 6b9e7c57ebf393078305e860f2e46ae43916d4f0 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 | 67 ++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 30 deletions(-)
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..39bdd7b5536b 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,26 +1,37 @@
# 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
+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"
CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
@@ -28,30 +39,26 @@ 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
` (3 preceding siblings ...)
2023-05-23 13:04 ` Emru1
@ 2023-05-27 18:12 ` Emru1
2023-05-27 18:21 ` Emru1
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-27 18:12 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
` (4 preceding siblings ...)
2023-05-27 18:12 ` Emru1
@ 2023-05-27 18:21 ` Emru1
2023-05-27 19:14 ` Emru1
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-27 18:21 UTC (permalink / raw)
To: ml
[-- 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 9ef2f29180c1dff244b67704b4f8e9ec82769eeb 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 | 73 ++++++++++++++++++++++------------------
1 file changed, 41 insertions(+), 32 deletions(-)
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..f86aa1b2e579 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,66 @@
# 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"
-CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
` (5 preceding siblings ...)
2023-05-27 18:21 ` Emru1
@ 2023-05-27 19:14 ` Emru1
2023-05-27 21:41 ` Emru1
2023-06-01 14:31 ` [PR PATCH] [Closed]: " Emru1
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-27 19:14 UTC (permalink / raw)
To: ml
[-- 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: 5074 bytes --]
From 66d82465611014dbca02a318c3289db963a7d581 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.
---
.../openttd/patches/regression_tests.patch | 11 +++
srcpkgs/openttd/template | 73 ++++++++++---------
2 files changed, 51 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/openttd/patches/regression_tests.patch
diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
new file mode 100644
index 000000000000..fa0baf1f825e
--- /dev/null
+++ b/srcpkgs/openttd/patches/regression_tests.patch
@@ -0,0 +1,11 @@
+index 19fece83f5..641e1e6de2 100644
+--- a/openttd-13.1/cmake/scripts/Regression.cmake
++++ b/openttd-13.1/cmake/scripts/Regression.cmake
+@@ -53,6 +53,7 @@ endif()
+ string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
++string(REPLACE "(null : 0x0)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+
+ # Remove timestamps if any
+ string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..3649699062df 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,64 @@
# 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"
-CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
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() {
+ cp ../opengfx-${_gfxver}/*.grf build/baseset
+ cp ../opengfx-${_gfxver}/opengfx.obg build/baseset
+ cp ../opensfx-${_sfxver}/opensfx.* build/baseset
+ cp -r ../openmsx-${_msxver} 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
` (6 preceding siblings ...)
2023-05-27 19:14 ` Emru1
@ 2023-05-27 21:41 ` Emru1
2023-06-01 14:31 ` [PR PATCH] [Closed]: " Emru1
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-05-27 21:41 UTC (permalink / raw)
To: ml
[-- 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: 5083 bytes --]
From fba317bd608d919e2fd6f320623b0db5ae438a62 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.
---
.../openttd/patches/regression_tests.patch | 11 +++
srcpkgs/openttd/template | 73 ++++++++++---------
2 files changed, 51 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/openttd/patches/regression_tests.patch
diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
new file mode 100644
index 000000000000..f36019c7e920
--- /dev/null
+++ b/srcpkgs/openttd/patches/regression_tests.patch
@@ -0,0 +1,11 @@
+index 19fece83f5..641e1e6de2 100644
+--- a/openttd-13.1/cmake/scripts/Regression.cmake
++++ b/openttd-13.1/cmake/scripts/Regression.cmake
+@@ -53,6 +53,7 @@ endif()
+ string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
++string(REPLACE "(null : 0x0)" "(null : 0x00000000)" REGRESSION_RESULT "${REGRESSION_RESULT}")
+
+ # Remove timestamps if any
+ string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..3649699062df 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,64 @@
# 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"
-CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
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() {
+ cp ../opengfx-${_gfxver}/*.grf build/baseset
+ cp ../opengfx-${_gfxver}/opengfx.obg build/baseset
+ cp ../opensfx-${_sfxver}/opensfx.* build/baseset
+ cp -r ../openmsx-${_msxver} 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: openttd: update to 13.1.
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
` (7 preceding siblings ...)
2023-05-27 21:41 ` Emru1
@ 2023-06-01 14:31 ` Emru1
8 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-06-01 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 945 bytes --]
There's a closed pull request on the void-packages repository
openttd: update to 13.1.
https://github.com/void-linux/void-packages/pull/43962
Description:
<!-- 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PR PATCH] openttd: update to 13.1.
@ 2023-06-01 14:32 Emru1
0 siblings, 0 replies; 11+ messages in thread
From: Emru1 @ 2023-06-01 14:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
There is a new 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/44212
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**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- amd64-musl
A patch file from https://github.com/void-linux/void-packages/pull/44212.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openttd-44212.patch --]
[-- Type: text/x-diff, Size: 5083 bytes --]
From 92cb1b2be1e9204310f843d713c3b8194737c6a2 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.
---
.../openttd/patches/regression_tests.patch | 11 +++
srcpkgs/openttd/template | 73 ++++++++++---------
2 files changed, 51 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/openttd/patches/regression_tests.patch
diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
new file mode 100644
index 000000000000..f36019c7e920
--- /dev/null
+++ b/srcpkgs/openttd/patches/regression_tests.patch
@@ -0,0 +1,11 @@
+index 19fece83f5..641e1e6de2 100644
+--- a/openttd-13.1/cmake/scripts/Regression.cmake
++++ b/openttd-13.1/cmake/scripts/Regression.cmake
+@@ -53,6 +53,7 @@ endif()
+ string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
+ string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
++string(REPLACE "(null : 0x0)" "(null : 0x00000000)" REGRESSION_RESULT "${REGRESSION_RESULT}")
+
+ # Remove timestamps if any
+ string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index e4d44db980fb..3649699062df 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,64 @@
# 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"
-CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
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() {
+ cp ../opengfx-${_gfxver}/*.grf build/baseset
+ cp ../opengfx-${_gfxver}/opengfx.obg build/baseset
+ cp ../opensfx-${_sfxver}/opensfx.* build/baseset
+ cp -r ../openmsx-${_msxver} 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
}
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-06-01 14:32 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-20 13:13 [PR PATCH] openttd: update to 13.1 Emru1
2023-05-20 13:15 ` [PR PATCH] [Updated] " Emru1
2023-05-21 17:05 ` Emru1
2023-05-21 17:26 ` Emru1
2023-05-23 13:04 ` Emru1
2023-05-27 18:12 ` Emru1
2023-05-27 18:21 ` Emru1
2023-05-27 19:14 ` Emru1
2023-05-27 21:41 ` Emru1
2023-06-01 14:31 ` [PR PATCH] [Closed]: " Emru1
2023-06-01 14:32 [PR PATCH] " Emru1
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).