gzdoom-git-4.4pre+72+g56311b765-1

4 files changed, 136 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 36632a10fa95..29f19d918106 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,35 @@
 pkgbase = gzdoom-git
 	pkgdesc = Advanced Doom source port with OpenGL support (git version)
-	pkgver = 4.3pre+643+g442f953d6
+	pkgver = 4.4pre+72+g56311b765
 	pkgrel = 1
 	url = http://www.zdoom.org/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	license = custom:dumb
 	license = GPL3
 	license = LGPL3
 	makedepends = cmake
 	makedepends = desktop-file-utils
-	makedepends = fluidsynth>=2
 	makedepends = git
-	makedepends = gtk3
-	depends = alsa-lib
+	depends = gtk3
 	depends = hicolor-icon-theme
 	depends = libgl
 	depends = libjpeg
+	depends = openal
 	depends = sdl2
+	depends = zmusic
 	optdepends = blasphemer-wad: Blasphemer (free Heretic) game data
 	optdepends = chexquest3-wad: Chex Quest 3 game data
 	optdepends = doom1-wad: Doom shareware game data
-	optdepends = fluidsynth>=2: FluidSynth MIDI device
 	optdepends = freedm: FreeDM game data
 	optdepends = freedoom1: Freedoom: Phase 1 game data
 	optdepends = freedoom2: Freedoom: Phase 2 game data
-	optdepends = gtk3: IWAD selection dialog
 	optdepends = gxmessage: crash dialog (GNOME)
 	optdepends = hacx-wad: HacX game data
 	optdepends = harmony-wad: Harmony game data
 	optdepends = heretic1-wad: Heretic shareware game data
 	optdepends = hexen1-wad: Hexen demo game data
 	optdepends = kdialog: crash dialog (KDE)
-	optdepends = libsndfile: WAV/FLAC/OGG audio support
-	optdepends = mpg123: MP3 audio support
-	optdepends = openal: in-game sound
-	optdepends = soundfont-fluid: FluidR3 soundfont for FluidSynth
 	optdepends = strife0-wad: Strife shareware game data
 	optdepends = square1-wad: The Adventures of Square, Episode 1 game data
 	optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
@@ -46,10 +39,10 @@ pkgbase = gzdoom-git
 	replaces = gzdoom1-git
 	source = gzdoom::git://github.com/coelckers/gzdoom.git
 	source = gzdoom.desktop
-	source = 0001-Fix-soundfont-search-path.patch
+	source = 0001-Fix-file-paths.patch
 	sha256sums = SKIP
 	sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
-	sha256sums = 11323f98caadb086b35cce1697744eeba53c96a3f4f9a8c9184ed23e6fb1ea61
+	sha256sums = fb91388572f388d14983ea49f153b6fed36288b283faf6745a25427282c9a20f
 	optdepends_x86_64 = vulkan-driver: Vulkan renderer
 	optdepends_x86_64 = vulkan-icd-loader: Vulkan renderer
 
diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch
new file mode 100644
index 000000000000..83c5a9e0f1ff
--- /dev/null
+++ b/0001-Fix-file-paths.patch
@@ -0,0 +1,93 @@
+From 9def07d1ab571430ee97c3db3022b5ba647b3f21 Mon Sep 17 00:00:00 2001
+From: Jan Cholasta <jan@cholasta.net>
+Date: Tue, 25 Feb 2020 12:53:07 +0100
+Subject: [PATCH] Fix file paths
+
+---
+ src/gameconfigfile.cpp          | 14 ++------------
+ src/posix/sdl/i_main.cpp        | 14 +-------------
+ src/sound/music/i_soundfont.cpp |  4 +---
+ 3 files changed, 4 insertions(+), 28 deletions(-)
+
+diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
+index a04264dbe..55e66bc4c 100644
+--- a/src/gameconfigfile.cpp
++++ b/src/gameconfigfile.cpp
+@@ -108,8 +108,6 @@ FGameConfigFile::FGameConfigFile ()
+ 		// Arch Linux likes them in /usr/share/doom
+ 		// Debian likes them in /usr/share/games/doom
+ 		// I assume other distributions don't do anything radically different
+-		SetValueForKey ("Path", "/usr/local/share/doom", true);
+-		SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ 		SetValueForKey ("Path", "/usr/share/doom", true);
+ 		SetValueForKey ("Path", "/usr/share/games/doom", true);
+ #endif
+@@ -129,8 +127,6 @@ FGameConfigFile::FGameConfigFile ()
+ #else
+ 		SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
+ 		SetValueForKey ("Path", SHARE_DIR, true);
+-		SetValueForKey ("Path", "/usr/local/share/doom", true);
+-		SetValueForKey ("Path", "/usr/local/share/games/doom", true);
+ 		SetValueForKey ("Path", "/usr/share/doom", true);
+ 		SetValueForKey ("Path", "/usr/share/games/doom", true);
+ #endif
+@@ -156,14 +152,8 @@ FGameConfigFile::FGameConfigFile ()
+ #else
+ 		SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true);
+ 		SetValueForKey("Path", "$HOME/" GAME_DIR "/fm_banks", true);
+-		SetValueForKey("Path", "/usr/local/share/doom/soundfonts", true);
+-		SetValueForKey("Path", "/usr/local/share/doom/fm_banks", true);
+-		SetValueForKey("Path", "/usr/local/share/games/doom/soundfonts", true);
+-		SetValueForKey("Path", "/usr/local/share/games/doom/fm_banks", true);
+-		SetValueForKey("Path", "/usr/share/doom/soundfonts", true);
+-		SetValueForKey("Path", "/usr/share/doom/fm_banks", true);
+-		SetValueForKey("Path", "/usr/share/games/doom/soundfonts", true);
+-		SetValueForKey("Path", "/usr/share/games/doom/fm_banks", true);
++		SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/soundfonts", true);
++		SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/fm_banks", true);
+ #endif
+ 	}
+ 
+diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp
+index 9004dc0a3..a88dfcf18 100644
+--- a/src/posix/sdl/i_main.cpp
++++ b/src/posix/sdl/i_main.cpp
+@@ -187,19 +187,7 @@ int main (int argc, char **argv)
+ 	Args = new FArgs(argc, argv);
+ 
+ 	// Should we even be doing anything with progdir on Unix systems?
+-	char program[PATH_MAX];
+-	if (realpath (argv[0], program) == NULL)
+-		strcpy (program, argv[0]);
+-	char *slash = strrchr (program, '/');
+-	if (slash != NULL)
+-	{
+-		*(slash + 1) = '\0';
+-		progdir = program;
+-	}
+-	else
+-	{
+-		progdir = "./";
+-	}
++	progdir = "/usr/lib/gzdoom/";
+ 	
+ 	I_StartupJoysticks();
+ 
+diff --git a/src/sound/music/i_soundfont.cpp b/src/sound/music/i_soundfont.cpp
+index 400f92cb6..41896ae32 100644
+--- a/src/sound/music/i_soundfont.cpp
++++ b/src/sound/music/i_soundfont.cpp
+@@ -231,9 +231,7 @@ FPatchSetReader::FPatchSetReader(const char *filename)
+ #ifndef _WIN32
+ 	mCaseSensitivePaths = true;
+ 	const char *paths[] = {
+-		"/usr/local/lib/timidity",
+-		"/etc/timidity",
+-		"/etc"
++		"/etc/timidity++"
+ 	};
+ #else
+ 	const char *paths[] = {
+-- 
+2.25.0
+
diff --git a/0001-Fix-soundfont-search-path.patch b/0001-Fix-soundfont-search-path.patch
deleted file mode 100644
index 0c1ac9da73fd..000000000000
--- a/0001-Fix-soundfont-search-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c70f3a7973eef99c6709f11be75d7fe1bdc29efd Mon Sep 17 00:00:00 2001
-From: Jan Cholasta <jan@cholasta.net>
-Date: Mon, 5 Mar 2018 16:17:24 +0100
-Subject: [PATCH] Fix soundfont search path
-
----
- src/gameconfigfile.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
-index 2979420f9..c8f22895c 100644
---- a/src/gameconfigfile.cpp
-+++ b/src/gameconfigfile.cpp
-@@ -149,6 +149,8 @@ FGameConfigFile::FGameConfigFile ()
- #else
- 		SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true);
- 		SetValueForKey("Path", "$HOME/" GAME_DIR "/fm_banks", true);
-+		SetValueForKey("Path", SHARE_DIR "/soundfonts", true);
-+		SetValueForKey("Path", SHARE_DIR "/fm_banks", true);
- 		SetValueForKey("Path", "/usr/local/share/doom/soundfonts", true);
- 		SetValueForKey("Path", "/usr/local/share/doom/fm_banks", true);
- 		SetValueForKey("Path", "/usr/local/share/games/doom/soundfonts", true);
-@@ -157,6 +159,7 @@ FGameConfigFile::FGameConfigFile ()
- 		SetValueForKey("Path", "/usr/share/doom/fm_banks", true);
- 		SetValueForKey("Path", "/usr/share/games/doom/soundfonts", true);
- 		SetValueForKey("Path", "/usr/share/games/doom/fm_banks", true);
-+		SetValueForKey("Path", "/usr/share/soundfonts", true);
- #endif
- 	}
- 
--- 
-2.19.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 0f47c905b1e8..db437c3d4362 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,102 +1,78 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
-_name=gzdoom
-pkgname=${_name}-git
-pkgver=4.3pre+643+g442f953d6
+pkgname=gzdoom-git
+pkgver=4.4pre+72+g56311b765
 pkgrel=1
 pkgdesc='Advanced Doom source port with OpenGL support (git version)'
 arch=('i686' 'x86_64')
 url='http://www.zdoom.org/'
-license=('BSD' 'custom:dumb' 'GPL3' 'LGPL3')
-depends=('alsa-lib'
+license=('BSD' 'GPL3' 'LGPL3')
+depends=('gtk3'
          'hicolor-icon-theme'
          'libgl'
          'libjpeg'
-         'sdl2')
-makedepends=('cmake'
-             'desktop-file-utils'
-             'fluidsynth>=2'
-             'git'
-             'gtk3')
+         'openal'
+         'sdl2'
+         'zmusic')
+makedepends=('cmake' 'desktop-file-utils' 'git')
 optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
             'chexquest3-wad: Chex Quest 3 game data'
             'doom1-wad: Doom shareware game data'
-            'fluidsynth>=2: FluidSynth MIDI device'
             'freedm: FreeDM game data'
             'freedoom1: Freedoom: Phase 1 game data'
             'freedoom2: Freedoom: Phase 2 game data'
-            'gtk3: IWAD selection dialog'
             'gxmessage: crash dialog (GNOME)'
             'hacx-wad: HacX game data'
             'harmony-wad: Harmony game data'
             'heretic1-wad: Heretic shareware game data'
             'hexen1-wad: Hexen demo game data'
             'kdialog: crash dialog (KDE)'
-            'libsndfile: WAV/FLAC/OGG audio support'
-            'mpg123: MP3 audio support'
-            'openal: in-game sound'
-            'soundfont-fluid: FluidR3 soundfont for FluidSynth'
             'strife0-wad: Strife shareware game data'
             'square1-wad: The Adventures of Square, Episode 1 game data'
             'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data'
             'xorg-xmessage: crash dialog (other)')
 optdepends_x86_64=('vulkan-driver: Vulkan renderer'
                    'vulkan-icd-loader: Vulkan renderer')
-provides=("${_name}")
-conflicts=("${_name}")
-replaces=("${_name}1-git")
-source=("${_name}::git://github.com/coelckers/${_name}.git"
-        "${_name}.desktop"
-        '0001-Fix-soundfont-search-path.patch')
+provides=('gzdoom')
+conflicts=('gzdoom')
+replaces=('gzdoom1-git')
+source=('gzdoom::git://github.com/coelckers/gzdoom.git'
+        'gzdoom.desktop'
+        '0001-Fix-file-paths.patch')
 sha256sums=('SKIP'
             '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
-            '11323f98caadb086b35cce1697744eeba53c96a3f4f9a8c9184ed23e6fb1ea61')
+            'fb91388572f388d14983ea49f153b6fed36288b283faf6745a25427282c9a20f')
 
 pkgver() {
-    cd $_name
-
-    git describe --long --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/-/+/g'
+    cd gzdoom
+    git describe --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/-/+/g'
 }
 
 prepare() {
-    cd $_name
-
-    patch -p1 -i"$srcdir"/0001-Fix-soundfont-search-path.patch
+    cd gzdoom
+    patch -i "$srcdir"/0001-Fix-file-paths.patch -p 1
 }
 
 build() {
-    cd $_name
-
-    local _cflags="-ffile-prefix-map=\"$PWD\"=. \
-                   -DSHARE_DIR=\\\"/usr/share/$_name\\\" \
-                   -DFLUIDSYNTHLIB2=\\\"libfluidsynth.so.2\\\""
-    cmake -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_C_FLAGS="${CFLAGS} ${_cflags}" \
-          -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${_cflags}" \
-          -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -Wl,-z,noexecstack" \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DINSTALL_PATH=bin \
-          -DINSTALL_PK3_PATH=share/$_name \
-          .
-    make
+    cd gzdoom
+    mkdir -p build
+    cmake -B build \
+          -D CMAKE_BUILD_TYPE=Release \
+          -D CMAKE_CXX_FLAGS="${CXXFLAGS} -ffile-prefix-map=\"$PWD\"=. -DSHARE_DIR=\\\"/usr/share/$_name\\\"" \
+          -D DYN_GTK=OFF \
+          -D DYN_OPENAL=OFF
+    make -C build
 }
 
 package() {
-    cd $_name
-
-    make install DESTDIR="$pkgdir"
-    install -D -m644 soundfonts/gzdoom.sf2 \
-            "$pkgdir"/usr/share/$_name/soundfonts/gzdoom.sf2
-    install -D -m644 fm_banks/GENMIDI.GS.wopl \
-            "$pkgdir"/usr/share/$_name/fm_banks/GENMIDI.GS.wopl
-    install -D -m644 fm_banks/gs-by-papiezak-and-sneakernets.wopn \
-            "$pkgdir"/usr/share/$_name/fm_banks/gs-by-papiezak-and-sneakernets.wopn
-
-    desktop-file-install --dir="$pkgdir"/usr/share/applications \
-                         "$srcdir"/${_name}.desktop
-    install -D -m644 src/posix/zdoom.xpm \
-            "$pkgdir"/usr/share/icons/hicolor/256x256/apps/${_name}.xpm
-
-    install -d "$pkgdir"/usr/share/licenses
-    ln -s /usr/share/doc/$_name/licenses "$pkgdir"/usr/share/licenses/$pkgname
+    cd gzdoom
+    install build/gzdoom -t "$pkgdir"/usr/bin -D
+    install build/gzdoom.pk3 -t "$pkgdir"/usr/lib/gzdoom -D -m 644
+    desktop-file-install "$srcdir"/gzdoom.desktop --dir="$pkgdir"/usr/share/applications
+    install docs/{console,rh-log,skins}.* -t "$pkgdir"/usr/share/doc/gzdoom -D -m 644
+    install build/{brightmaps,lights,game_support}.pk3 -t "$pkgdir"/usr/share/gzdoom -D -m 644
+    install build/soundfonts/gzdoom.sf2 -t "$pkgdir"/usr/share/gzdoom/soundfonts -D -m 644
+    install build/fm_banks/* -t "$pkgdir"/usr/share/gzdoom/fm_banks -D -m 644
+    install src/posix/zdoom.xpm "$pkgdir"/usr/share/icons/hicolor/256x256/apps/gzdoom.xpm -D -m 644
+    install docs/licenses/{bsd,fxaa,gdtoa,README}.* -t "$pkgdir"/usr/share/licenses/$pkgname -D -m 644
 }