aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2020-04-06 19:23:10 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-04-07 00:44:46 +0000
commitd022ef56db396677256448aabbd5cd739b0ebd07 (patch)
treea71b2dbda1fbfcd07fc534ba7870de460f500c36
parent3db6443f43076286d4bd3343d4c2b432e798547b (diff)
downloadaports-d022ef56db396677256448aabbd5cd739b0ebd07.tar.bz2
aports-d022ef56db396677256448aabbd5cd739b0ebd07.tar.xz
testing/openttd: upgrade to 1.10.0
-rw-r--r--testing/openttd/APKBUILD11
-rw-r--r--testing/openttd/fix-pthread-stacksize.patch15
2 files changed, 4 insertions, 22 deletions
diff --git a/testing/openttd/APKBUILD b/testing/openttd/APKBUILD
index c880e02a52..f63a78baf1 100644
--- a/testing/openttd/APKBUILD
+++ b/testing/openttd/APKBUILD
@@ -1,18 +1,16 @@
# Contributor: Adrian Siekierka <kontakt@asie.pl>
# Maintainer: Adrian Siekierka <kontakt@asie.pl>
pkgname=openttd
-pkgver=1.9.3
+pkgver=1.10.0
pkgrel=0
pkgdesc="Open source version of the Transport Tycoon Deluxe simulator"
url="https://www.openttd.org"
arch="all"
license="GPL-2.0-or-later"
-makedepends="fontconfig-dev freetype-dev icu-dev libpng-dev lzo-dev sdl-dev xz-dev zlib-dev"
+makedepends="fontconfig-dev freetype-dev icu-dev libpng-dev lzo-dev sdl2-dev xz-dev zlib-dev"
checkdepends="openttd-opengfx"
subpackages="$pkgname-doc $pkgname-lang::noarch"
-source="https://cdn.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz
- fix-pthread-stacksize.patch
- "
+source="https://cdn.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz"
build() {
# OpenTTD's builtin strip does not work when cross-compiling,
@@ -54,5 +52,4 @@ lang() {
done
}
-sha512sums="e2208f730cf26c2df9b1950e885e20471060217dd47f2483db3f1cc86b40658d71208f27caab38a9fa513cfddb33c791a0972336dfa902a6d110ef246d936a34 openttd-1.9.3-source.tar.xz
-b6dcf89c515b199c8e585ffcfab166346074e1e6df8976f0630ceaee1d5411f57c0319e6afd1bc8608aa21a8cddae9e758de8b8c3d582a2b26a9037e4b6a704a fix-pthread-stacksize.patch"
+sha512sums="f1727b81a059aa04bea1fb6a9a89ae0619942d6406a77f99e642a60ea9416daa215bbd0cbd183747c2df5f6dea81766b7e04493a52211e55522e8b2642db701a openttd-1.10.0-source.tar.xz"
diff --git a/testing/openttd/fix-pthread-stacksize.patch b/testing/openttd/fix-pthread-stacksize.patch
deleted file mode 100644
index a4b3155186..0000000000
--- a/testing/openttd/fix-pthread-stacksize.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Only in openttd-1.8.0-mod: src/saveload/.saveload.cpp.swp
---- a/src/thread/thread_pthread.cpp
-+++ b/src/thread/thread_pthread.cpp
-@@ -42,7 +42,10 @@
- self_destruct(self_destruct),
- name(name)
- {
-- pthread_create(&this->thread, NULL, &stThreadProc, this);
-+ pthread_attr_t attrs;
-+ pthread_attr_init(&attrs);
-+ pthread_attr_setstacksize(&attrs, 1048576);
-+ pthread_create(&this->thread, &attrs, &stThreadProc, this);
- }
-
- /* virtual */ bool Exit()