Fix compilation with latest version of SDL2_mixer

4 files changed, 42 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c02117ab610f..50533f000c7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jan  2 22:14:49 UTC 2017
 pkgbase = dunelegacy
 	pkgdesc = Updated clone of Westood Studios' Dune2
 	pkgver = 0.96.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://dunelegacy.sourceforge.net
 	changelog = dunelegacy.changelog
 	arch = i686
@@ -12,7 +10,9 @@ pkgbase = dunelegacy
 	depends = sdl2_mixer
 	depends = xdg-utils
 	source = http://downloads.sourceforge.net/sourceforge/dunelegacy/dunelegacy-0.96.4-src.tar.bz2
+	source = mix_init_mid.patch
 	md5sums = de1d0a529cc32ba5d909bf1570272434
+	md5sums = 9a074011e5dd75f9d3c0f5a14bdd1600
 
 pkgname = dunelegacy
 
diff --git a/PKGBUILD b/PKGBUILD
index 87cba69656e6..2e29b6444215 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,29 @@
 
 pkgname=dunelegacy
 pkgver=0.96.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Updated clone of Westood Studios' Dune2"
 arch=('i686' 'x86_64')
 url="http://dunelegacy.sourceforge.net"
 license=('GPL')
 depends=('sdl2_mixer' 'xdg-utils')
 changelog=dunelegacy.changelog
-source=(http://downloads.sourceforge.net/sourceforge/dunelegacy/$pkgname-$pkgver-src.tar.bz2)
-md5sums=('de1d0a529cc32ba5d909bf1570272434')
+source=(http://downloads.sourceforge.net/sourceforge/dunelegacy/$pkgname-$pkgver-src.tar.bz2 mix_init_mid.patch)
+md5sums=('de1d0a529cc32ba5d909bf1570272434' '9a074011e5dd75f9d3c0f5a14bdd1600')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch --forward --strip=1 --input="${srcdir}/mix_init_mid.patch"
+}
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make || return 1
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make prefix=$pkgdir/usr install
 
   # install icon and desktop files
diff --git a/dunelegacy.changelog b/dunelegacy.changelog
index 99795df66f40..78d604761dc0 100644
--- a/dunelegacy.changelog
+++ b/dunelegacy.changelog
@@ -1,3 +1,8 @@
+2021-04-14 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Add a patch to compile with latest version of SDL2_mixer
+
 2017-01-02 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
 
 	* PKGBUILD :
diff --git a/mix_init_mid.patch b/mix_init_mid.patch
new file mode 100644
index 000000000000..8e364d1670fd
--- /dev/null
+++ b/mix_init_mid.patch
@@ -0,0 +1,24 @@
+diff -urN dunelegacy-0.96.4_orig/src/FileClasses/music/DirectoryPlayer.cpp dunelegacy-0.96.4/src/FileClasses/music/DirectoryPlayer.cpp
+--- dunelegacy-0.96.4_orig/src/FileClasses/music/DirectoryPlayer.cpp	2016-11-20 15:57:02.000000000 +0100
++++ dunelegacy-0.96.4/src/FileClasses/music/DirectoryPlayer.cpp	2021-04-14 10:00:04.599753950 +0200
+@@ -61,7 +61,7 @@
+ 
+     music = nullptr;
+ 
+-    Mix_Init(MIX_INIT_FLUIDSYNTH | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG);
++    Mix_Init(MIX_INIT_MID | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG);
+ }
+ 
+ DirectoryPlayer::~DirectoryPlayer() {
+diff -urN dunelegacy-0.96.4_orig/src/FileClasses/music/XMIPlayer.cpp dunelegacy-0.96.4/src/FileClasses/music/XMIPlayer.cpp
+--- dunelegacy-0.96.4_orig/src/FileClasses/music/XMIPlayer.cpp	2016-11-18 00:06:11.000000000 +0100
++++ dunelegacy-0.96.4/src/FileClasses/music/XMIPlayer.cpp	2021-04-14 09:59:37.333085385 +0200
+@@ -32,7 +32,7 @@
+ XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic, settings.audio.musicVolume) {
+     music = nullptr;
+ 
+-    if((Mix_Init(MIX_INIT_FLUIDSYNTH) & MIX_INIT_FLUIDSYNTH) == 0) {
++    if((Mix_Init(MIX_INIT_MID) & MIX_INIT_MID) == 0) {
+         SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError());
+     }
+ }