nightly build 20200827

4 files changed, 22 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c7d41175bef..50225403584a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = simutrans-nightly
 	pkgdesc = Transportation simulation game - Nightly build
-	pkgver = 20200826
+	pkgver = 20200827
 	pkgrel = 1
 	url = https://www.simutrans.com/
-	arch = x86_64
+	install = simutrans-nightly.install
+	arch = any
 	license = custom:Artistic
 	makedepends = dos2unix
 	makedepends = git
 	makedepends = pkgconf
 	depends = gcc-libs
 	depends = zlib
-	depends = sdl_mixer
+	depends = sdl2_mixer
 	depends = bzip2
 	depends = hicolor-icon-theme
 	depends = freetype2
 	depends = miniupnpc
-	optdepends = timidity++: play MIDI music
+	optdepends = fluidsynth: play MIDI music
 	optdepends = simutrans-pak32.comic: Lowest resolution graphics set for Simutrans
 	optdepends = simutrans-pak48.excentrique: Low resolution graphics set for Simutrans, with an eccentric theme
 	optdepends = simutrans-pak64: Low resolution graphics set for Simutrans
@@ -46,7 +47,7 @@ pkgbase = simutrans-nightly
 	sha256sums = c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81
 	sha256sums = 671398550f46525ef0dae338d9e1984bfc0e1ec36153e1c4163c8c35de240c7e
 	sha256sums = 0d37c0d25928fc4f8a6fc30e4dbf7b2b949f183e87e27f69494f38bbab5708f0
-	sha256sums = da30fa691324fa1705c93be9b82e025f76ded9249e8c82acd4fa4fb537edd23c
+	sha256sums = ec089577494bf0555cbf9190dd366587baaa1e3fbd4f3d6401f8898b84d8be57
 	sha256sums = 99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3
 	sha256sums = f933d5608052b73e03e21d4ade0909e471c643ee5493023921fa5bc963a06ab3
 
diff --git a/PKGBUILD b/PKGBUILD
index ab054fe941a4..7ca23a3a6cba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,16 @@
 # PKGBUILD adapted from Simutrans https://www.archlinux.org/packages/community/x86_64/simutrans/
 
 pkgname=simutrans-nightly
-pkgver=20200826
+pkgver=20200827
 pkgrel=1
 pkgdesc="Transportation simulation game - Nightly build"
-arch=('x86_64')
+arch=('any')
 url="https://www.simutrans.com/"
 license=('custom:Artistic')
-depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'hicolor-icon-theme' 'freetype2' 'miniupnpc')
+install="$pkgname.install"
+depends=('gcc-libs' 'zlib' 'sdl2_mixer' 'bzip2' 'hicolor-icon-theme' 'freetype2' 'miniupnpc')
 makedepends=('dos2unix' 'git' 'pkgconf')
-optdepends=('timidity++: play MIDI music'
+optdepends=('fluidsynth: play MIDI music'
             'simutrans-pak32.comic: Lowest resolution graphics set for Simutrans'
             'simutrans-pak48.excentrique: Low resolution graphics set for Simutrans, with an eccentric theme'
             'simutrans-pak64: Low resolution graphics set for Simutrans'
@@ -43,10 +44,10 @@ sha256sums=('SKIP'
             'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
             '671398550f46525ef0dae338d9e1984bfc0e1ec36153e1c4163c8c35de240c7e'
             '0d37c0d25928fc4f8a6fc30e4dbf7b2b949f183e87e27f69494f38bbab5708f0'
-            'da30fa691324fa1705c93be9b82e025f76ded9249e8c82acd4fa4fb537edd23c'
+            'ec089577494bf0555cbf9190dd366587baaa1e3fbd4f3d6401f8898b84d8be57'
             '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3'
-            'f933d5608052b73e03e21d4ade0909e471c643ee5493023921fa5bc963a06ab3')
-
+            'f933d5608052b73e03e21d4ade0909e471c643ee5493023921fa5bc963a06ab3')      
+            
 prepare() {
   # Some files are distributed in DOS format
   find . -type f -exec dos2unix -q '{}' \;
@@ -81,4 +82,5 @@ package() {
 
   #license
   install -Dm644 simutrans/simutrans/license.txt "$pkgdir/usr/share/licenses/simutrans/license.txt"
+  
 }
diff --git a/config.patch b/config.patch
index 090162946f0f..f28cb22e060e 100644
--- a/config.patch
+++ b/config.patch
@@ -5,7 +5,7 @@
  #BACKEND = sdl
  #BACKEND = sdl2
 -#BACKEND = mixer_sdl
-+BACKEND = mixer_sdl
++BACKEND = mixer_sdl2
  #BACKEND = mixer_sdl2
  #BACKEND = posix
  
diff --git a/simutrans-nightly.install b/simutrans-nightly.install
new file mode 100644
index 000000000000..0f4dbe1a2827
--- /dev/null
+++ b/simutrans-nightly.install
@@ -0,0 +1,6 @@
+post_install() {
+
+  echo "To play MIDI music, along with fluidsynth, you will need to install a soundfont and set SDL_SOUNDFONTS=/path/to/soundfont"
+  echo "For example, with soundfont-fluid: SDL_SOUNDFONTS=/usr/share/soundfonts/FluidR3_GM.sf2 simutrans"
+  echo "Check the wiki to get more info about fluidsynth https://wiki.archlinux.org/index.php/FluidSynth"
+}