Update to 0.97.02

- Add a patch to fix the compilation of the TextManager class
- Remove the SDL2_mixer compilation patch

5 files changed, 57 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50533f000c7a..1c2326cd78ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = dunelegacy
 	pkgdesc = Updated clone of Westood Studios' Dune2
-	pkgver = 0.96.4
-	pkgrel = 2
+	pkgver = 0.97.02
+	pkgrel = 1
 	url = http://dunelegacy.sourceforge.net
 	changelog = dunelegacy.changelog
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = git
+	makedepends = autoconf
 	depends = sdl2_mixer
+	depends = sdl2_ttf
 	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
+	source = dunelegacy::git+https://git.code.sf.net/p/dunelegacy/code#commit=6ea9ac96854daa8c75ba429e78dc6716b147e106
+	source = text_manager.patch
+	md5sums = SKIP
+	md5sums = ee5ade548d7d5bbf1145b63be47183db
 
 pkgname = dunelegacy
-
diff --git a/PKGBUILD b/PKGBUILD
index 2e29b6444215..e5ce1c15b170 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,49 @@
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 
 pkgname=dunelegacy
-pkgver=0.96.4
-pkgrel=2
+pkgver=0.97.02
+pkgrel=1
 pkgdesc="Updated clone of Westood Studios' Dune2"
 arch=('i686' 'x86_64')
 url="http://dunelegacy.sourceforge.net"
 license=('GPL')
-depends=('sdl2_mixer' 'xdg-utils')
+depends=('sdl2_mixer' 'sdl2_ttf' 'xdg-utils')
+makedepends=('git' 'autoconf')
 changelog=dunelegacy.changelog
-source=(http://downloads.sourceforge.net/sourceforge/dunelegacy/$pkgname-$pkgver-src.tar.bz2 mix_init_mid.patch)
-md5sums=('de1d0a529cc32ba5d909bf1570272434' '9a074011e5dd75f9d3c0f5a14bdd1600')
+source=($pkgname::git+https://git.code.sf.net/p/dunelegacy/code#commit=6ea9ac96854daa8c75ba429e78dc6716b147e106 text_manager.patch)
+md5sums=('SKIP' ee5ade548d7d5bbf1145b63be47183db)
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch --forward --strip=1 --input="${srcdir}/mix_init_mid.patch"
+  cd $pkgname
+  patch --forward --strip=1 --input="${srcdir}/text_manager.patch"
 }
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
+  cd $pkgname
+
+  autoreconf --install
+  mkdir -p build
+  cd build
+  ../configure --prefix="/usr" && make $1 && cp src/dunelegacy ../
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make prefix=$pkgdir/usr install
+  cd $pkgname
+
+  install -Dm755 "dunelegacy" "$pkgdir/usr/bin/dunelegacy"
+
+  mkdir -p "$pkgdir/usr/share/dunelegacy"
+  install -m644 "data/LEGACY.PAK" "data/OPENSD2.PAK" "data/GFXHD.PAK" "data/Dune2-Versions.txt" "$pkgdir/usr/share/dunelegacy/"
+
+  mkdir -p "$pkgdir/usr/share/dunelegacy/locale"
+  cp -p data/locale/*.pot "$pkgdir/usr/share/dunelegacy/locale/"
+  cp -p data/locale/*.po "$pkgdir/usr/share/dunelegacy/locale/"
+
+  mkdir -p "$pkgdir/usr/share/dunelegacy/maps/singleplayer"
+  cp -p data/maps/singleplayer/*.ini "$pkgdir/usr/share/dunelegacy/maps/singleplayer/"
+
+  mkdir -p "$pkgdir/usr/share/dunelegacy/maps/multiplayer"
+  cp -p data/maps/multiplayer/*.ini "$pkgdir/usr/share/dunelegacy/maps/multiplayer/"
 
   # install icon and desktop files
   install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
diff --git a/dunelegacy.changelog b/dunelegacy.changelog
index 78d604761dc0..17cd001c0295 100644
--- a/dunelegacy.changelog
+++ b/dunelegacy.changelog
@@ -1,3 +1,10 @@
+2023-06-14 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
+
+	* PKGBUILD :
+	Updated the makedepends array
+	Add a patch to fix the compilation of the TextManager class
+	The patch to compile against the latest version of SDL2_mixer is not needed anymore
+
 2021-04-14 Angelo "Encelo" Theodorou  <encelo@users.sourceforge.net>
 
 	* PKGBUILD :
diff --git a/mix_init_mid.patch b/mix_init_mid.patch
deleted file mode 100644
index 8e364d1670fd..000000000000
--- a/mix_init_mid.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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());
-     }
- }
diff --git a/text_manager.patch b/text_manager.patch
new file mode 100644
index 000000000000..704d9581471a
--- /dev/null
+++ b/text_manager.patch
@@ -0,0 +1,11 @@
+diff -ur dunelegacy.orig/include/FileClasses/TextManager.h dunelegacy/include/FileClasses/TextManager.h
+--- dunelegacy.orig/include/FileClasses/TextManager.h	2023-06-14 12:38:06.296181593 +0200
++++ dunelegacy/include/FileClasses/TextManager.h	2023-06-14 12:30:46.579528680 +0200
+@@ -21,6 +21,7 @@
+ #include "IndexedTextFile.h"
+ #include "MentatTextFile.h"
+ 
++#include <array>
+ #include <string>
+ #include <vector>
+ #include <map>