summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--config.patch39
3 files changed, 21 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8608149bd5e1..f329563d57d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,7 +45,7 @@ pkgbase = simutrans-nightly
sha256sums = c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81
sha256sums = 053a2e3cf59fea40e3852ea3d369780741ed922cf53adb8b564af396bef9e502
sha256sums = 0d37c0d25928fc4f8a6fc30e4dbf7b2b949f183e87e27f69494f38bbab5708f0
- sha256sums = 11071101f87447f5eee542b07091c230d2c9ac3ece51e37d01b66329cc63d4bb
+ sha256sums = da30fa691324fa1705c93be9b82e025f76ded9249e8c82acd4fa4fb537edd23c
sha256sums = 99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3
sha256sums = f933d5608052b73e03e21d4ade0909e471c643ee5493023921fa5bc963a06ab3
diff --git a/PKGBUILD b/PKGBUILD
index 5e0f013ead98..848a1c7cda2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -43,7 +43,7 @@ sha256sums=('SKIP'
'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
'053a2e3cf59fea40e3852ea3d369780741ed922cf53adb8b564af396bef9e502'
'0d37c0d25928fc4f8a6fc30e4dbf7b2b949f183e87e27f69494f38bbab5708f0'
- '11071101f87447f5eee542b07091c230d2c9ac3ece51e37d01b66329cc63d4bb'
+ 'da30fa691324fa1705c93be9b82e025f76ded9249e8c82acd4fa4fb537edd23c'
'99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3'
'f933d5608052b73e03e21d4ade0909e471c643ee5493023921fa5bc963a06ab3')
diff --git a/config.patch b/config.patch
index 85266954fb40..090162946f0f 100644
--- a/config.patch
+++ b/config.patch
@@ -1,13 +1,13 @@
---- config.default.orig 2020-05-05 13:11:58.000000000 +0200
-+++ config.default 2020-05-05 13:14:30.062529132 +0200
-@@ -11,7 +11,7 @@
- #BACKEND = opengl
+--- config.default.orig 2020-05-05 13:23:54.788174103 +0200
++++ config.default 2020-05-05 13:26:26.632128916 +0200
+@@ -12,7 +12,7 @@
+ #BACKEND = gdi
#BACKEND = sdl
#BACKEND = sdl2
-#BACKEND = mixer_sdl
+BACKEND = mixer_sdl
+ #BACKEND = mixer_sdl2
#BACKEND = posix
- BACKEND = @backend@
@@ -21,7 +21,7 @@
#OSTYPE = cygwin
@@ -18,33 +18,32 @@
#OSTYPE = mingw
#OSTYPE = mac
-@@ -40,17 +40,17 @@
+@@ -39,23 +39,23 @@
#WIN32_CONSOLE = 1 # adds a console for windows debugging
--MULTI_THREAD = @multithread@ # Enable multithreading, highly recommended
-+MULTI_THREAD = 1 # Enable multithreading, highly recommended
- BUNDLE_PTHREADGC2 = @bundlepthread@
-
- # using UPnP for easy server hosting behind routers
--USE_UPNP = @upnp@
-+USE_UPNP = 1
+-#MULTI_THREAD = 1 # Enable multithreading
++MULTI_THREAD = 1 # Enable multithreading
# using freetype for Truetype font support
--USE_FREETYPE = @freetype@
+-USE_FREETYPE = 0
+USE_FREETYPE = 1
- # using zstd compression
--USE_ZSTD = @zstd@
+ # using UPnP for easy server hosting behind routers
+-#USE_UPNP = 0
++USE_UPNP = 1
+
+ # using zstd compression library
+-#USE_ZSTD = 0
+USE_ZSTD = 1
- # use static linking (to be at least somewhat portable)
- STATIC = 1
-@@ -60,6 +60,7 @@
+ # Define these as empty strings, if you don't have the respective config program
+ #ALLEGRO_CONFIG = allegro-config
#PNG_CONFIG = pkg-config libpng
#SDL_CONFIG = sdl-config
#SDL2_CONFIG = sdl2-config
-+FREETYPE_CONFIG = pkg-config freetype2
+-#FREETYPE_CONFIG = freetype-config
++FREETYPE_CONFIG = pkg-config freetype2
#VERBOSE = 1