fluidsynth update

3 files changed, 10 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d244b0f4ab51..69c4c414d1fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,11 +3,11 @@ pkgbase = simutrans-extended-git
 	pkgver = r18830.14e99df88
 	pkgrel = 1
 	url = https://www.simutrans.com/
-	install = simutrans-extended.install
 	arch = any
 	license = custom:Artistic
 	makedepends = pkgconf
 	makedepends = git
+	makedepends = cmake
 	depends = gcc-libs
 	depends = zstd
 	depends = zlib
@@ -15,7 +15,8 @@ pkgbase = simutrans-extended-git
 	depends = hicolor-icon-theme
 	depends = freetype2
 	depends = miniupnpc
-	optdepends = fluidsynth: play MIDI music
+	depends = fluidsynth
+	optdepends = soundfont-realfont: recommended MIDI soundfont
 	optdepends = simutrans-extended-pak128.britain: High resolution graphics set for Simutrans Extended, with a British theme
 	optdepends = simutrans-extended-pak128.cs: High resolution graphics set for Simutrans Extended, with a czech theme
 	optdepends = simutrans-extended-pak128.sweden: High resolution graphics set for Simutrans Extended, with a swedish theme
@@ -25,7 +26,6 @@ pkgbase = simutrans-extended-git
 	source = https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
 	source = settings-folder.patch
 	source = path-for-game-data.patch
-	source = config.patch
 	source = simutrans-extended.desktop
 	source = miniupnpc.patch
 	source = How to add files and paksets.md
@@ -33,7 +33,6 @@ pkgbase = simutrans-extended-git
 	sha256sums = c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81
 	sha256sums = 7ed69019ba97849b65e2b8ac5ad8bf2110a7f048e3590d67c76c9cfca8a10b8d
 	sha256sums = d1609eb40c9bbcdb6f13e10d1150f7995700249053aaa56da8b4a0aaf24f7260
-	sha256sums = 0d982430a8e1ca840e03d38e04499c30920ba66e07c6885c70f9e62468302ee1
 	sha256sums = 0efcf72d3670c53de99c44cb0d8f43f7e7663fda5df0f631ba6c687cc85967d3
 	sha256sums = b62cfde4070e533825b8800738ef191cb144f081ee91a195ca4f5c28cc024538
 	sha256sums = 1707b5adff4174af173ac4d7a5cab1fbcda9245e55c0149ed5c3274e7bfc586c
diff --git a/PKGBUILD b/PKGBUILD
index e81b4d3cb10a..1bee01ac32e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,9 @@ pkgdesc="Transportation simulation game - Extended Version - Nightly build from
 arch=('any')
 url="https://www.simutrans.com/"
 license=('custom:Artistic')
-install="simutrans-extended.install"
-depends=('gcc-libs' 'zstd' 'zlib' 'sdl2_mixer' 'hicolor-icon-theme' 'freetype2' 'miniupnpc')
-makedepends=('pkgconf' 'git')
-optdepends=('fluidsynth: play MIDI music'
+depends=('gcc-libs' 'zstd' 'zlib' 'sdl2_mixer' 'hicolor-icon-theme' 'freetype2' 'miniupnpc' 'fluidsynth')
+makedepends=('pkgconf' 'git' 'cmake')
+optdepends=('soundfont-realfont: recommended MIDI soundfont'
             'simutrans-extended-pak128.britain: High resolution graphics set for Simutrans Extended, with a British theme'
             'simutrans-extended-pak128.cs: High resolution graphics set for Simutrans Extended, with a czech theme'
             'simutrans-extended-pak128.sweden: High resolution graphics set for Simutrans Extended, with a swedish theme'
@@ -20,7 +19,6 @@ source=(git+https://github.com/jamespetts/simutrans-extended/
         https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
         settings-folder.patch
         path-for-game-data.patch
-        config.patch
         simutrans-extended.desktop
         miniupnpc.patch
         "How to add files and paksets.md")
@@ -28,7 +26,6 @@ sha256sums=('SKIP'
             'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
             '7ed69019ba97849b65e2b8ac5ad8bf2110a7f048e3590d67c76c9cfca8a10b8d'
             'd1609eb40c9bbcdb6f13e10d1150f7995700249053aaa56da8b4a0aaf24f7260'
-            '0d982430a8e1ca840e03d38e04499c30920ba66e07c6885c70f9e62468302ee1'
             '0efcf72d3670c53de99c44cb0d8f43f7e7663fda5df0f631ba6c687cc85967d3'
             'b62cfde4070e533825b8800738ef191cb144f081ee91a195ca4f5c28cc024538'
             '1707b5adff4174af173ac4d7a5cab1fbcda9245e55c0149ed5c3274e7bfc586c')
@@ -41,19 +38,20 @@ prepare() {
   patch -Np0 -i ../path-for-game-data.patch
 
   # Configure the build process
-  cp config.template config.default
-  patch -Np0 -i ../config.patch
   patch -Np0 -i ../miniupnpc.patch
 }
 
 build() {
   cd simutrans-extended
+  mkdir build
+  cd build
+  cmake ..
   make
 }
 
 package() {
   #binary
-  install -Dm755 simutrans-extended/build/default/simutrans-extended "$pkgdir/usr/bin/simutrans-extended"
+  install -Dm755 simutrans-extended/build/simutrans/simutrans-extended "$pkgdir/usr/bin/simutrans-extended"
   
   #data
   mkdir -p "$pkgdir/usr/share/games/simutrans-extended"
diff --git a/config.patch b/config.patch
deleted file mode 100644
index 16802a4ad52e..000000000000
--- a/config.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- config.default.orig	2021-01-22 22:00:17.324949087 +0100
-+++ config.default	2021-01-22 23:32:23.111701888 +0100
-@@ -10,19 +10,19 @@
- 
- #BACKEND = gdi
- #BACKEND = sdl
--#BACKEND = sdl2
-+BACKEND = sdl2
- #BACKEND = mixer_sdl
- #BACKEND = posix
- 
- #COLOUR_DEPTH = 0
--#COLOUR_DEPTH = 16
-+COLOUR_DEPTH = 16
- 
- #OSTYPE = amiga
- #OSTYPE = beos
- #OSTYPE = cygwin
- #OSTYPE = freebsd
- #OSTYPE = haiku
--#OSTYPE = linux
-+OSTYPE = linux
- #OSTYPE = mingw32
- #OSTYPE = mingw64
- #OSTYPE = mac
-@@ -44,10 +44,10 @@
- MULTI_THREAD = 1 # Enable multithreading
- 
- # using freetype for Truetype font support
--USE_FREETYPE = 0
-+USE_FREETYPE = 1
- 
- # using UPnP for easy server hosting behind routers
--#USE_UPNP = 0
-+USE_UPNP = 1
- 
- # using zstd compression library
- USE_ZSTD = 1
-@@ -57,6 +57,7 @@
- #SDL_CONFIG     = sdl-config
- #SDL2_CONFIG    = sdl2-config
- #FREETYPE_CONFIG = freetype-config
-+FREETYPE_CONFIG    = pkg-config freetype2
- 
- #VERBOSE = 1
-