- Update to release 0.27.3

OBS-URL: https://build.opensuse.org/package/show/games/dsda-doom?expand=0&rev=8

cmake-path-suffix.diff

@@ -0,0 +1,33 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2023-11-01 14:19:29.990929358 +0100
+References: https://github.com/kraflab/dsda-doom/issues/434
+
+[    6s] src/CMakeFiles/dsda-doom.dir/build.make:3952: warning: overriding recipe for target 'dsda-doom'
+[    6s] src/CMakeFiles/dsda-doom.dir/build.make:3943: warning: ignoring old recipe for target 'dsda-doom'
+[    6s] src/CMakeFiles/dsda-doom.dir/build.make:3952: warning: overriding recipe for target 'dsda-doom'
+[    6s] src/CMakeFiles/dsda-doom.dir/build.make:3943: warning: ignoring old recipe for target 'dsda-doom'
+[    6s] make[2]: *** No rule to make target 'optimized', needed by 'dsda-doom'.  Stop.
+[    6s] make[1]: *** [CMakeFiles/Makefile2:172: src/CMakeFiles/dsda-doom.dir/all] Error 2
+
+---
+ prboom2/cmake/FindLibMad.cmake |    2 --
+ 1 file changed, 2 deletions(-)
+
+Index: dsda-doom-0.27.2/prboom2/cmake/FindLibMad.cmake
+===================================================================
+--- dsda-doom-0.27.2.orig/prboom2/cmake/FindLibMad.cmake
++++ dsda-doom-0.27.2/prboom2/cmake/FindLibMad.cmake
+@@ -59,13 +59,11 @@ select_dll_configurations(LibMad)
+ find_library(
+   LibMad_LIBRARY_RELEASE
+   NAMES mad
+-  PATH_SUFFIXES ../../lib
+ )
+ 
+ find_library(
+   LibMad_LIBRARY_DEBUG
+   NAMES mad
+-  PATH_SUFFIXES ../debug/lib
+ )
+ 
+ include(SelectLibraryConfigurations)

dsda-doom.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sun Nov  5 22:26:17 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 0.27.3
+  * New indexed light mode (software fidelity in OpenGL).
+  * Improved controller support.
+  * A new HUD system with new components.
+  * New console commands and better usability.
+  * UDMF support, MAPINFO support
+  * ZIP file loading
+  * Improved Heretic and Hexen suport
+  * Upgraded to OPL3 emulation
+  * You can switch back to OPL2 with config option mus_opl_opl3mode
+- Delete prboom-nodatetime.diff, fluidsynth1.diff
+- Add cmake-path-suffix.diff
+- Note: If you updated from an old dsda-doom and use the same
+  config file, your default complevel may have been reset to 0. If
+  you run into an issue, check it out (suggested value is 21 /
+  mbf21, if you don't know what to pick).
+
 -------------------------------------------------------------------
 Wed Mar 30 18:39:27 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 

dsda-doom.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dsda-doom
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,29 +17,33 @@
 
 
 Name:           dsda-doom
-Version:        0.24.3
+Version:        0.27.3
 Release:        0
 Summary:        DOOM source port with Hexen support and demo compatibility
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/3D/Shoot
 URL:            https://github.com/kraflab/dsda-doom
 
-#Changelog:     https://github.com/kraflab/dsda-doom/blob/v0.24.3/patch_notes/v0.24.md
+#Changelog:     https://github.com/kraflab/dsda-doom/tree/master/patch_notes
 #Announce:      https://www.doomworld.com/forum/topic/118074-dsda-doom-source-port-v0243/
 Source:         https://github.com/kraflab/dsda-doom/archive/refs/tags/v%version.tar.gz
-Patch1:         prboom-nodatetime.diff
+Patch1:         cmake-path-suffix.diff
-Patch2:         prboom-hbar-all.diff
+#Patch2:         prboom-hbar-all.diff
-Patch3:         prboom-hbar-gradient.diff
+#Patch3:         prboom-hbar-gradient.diff
-Patch4:         fluidsynth1.diff
 BuildRequires:  Mesa-devel
 BuildRequires:  c++_compiler
 BuildRequires:  cmake
+BuildRequires:  fluidsynth
 BuildRequires:  fluidsynth-devel
 BuildRequires:  hicolor-icon-theme
+BuildRequires:  libmad-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libvorbis-devel
+BuildRequires:  libzip-devel
+BuildRequires:  libzip-tools
 BuildRequires:  pcre-devel
 BuildRequires:  portmidi-devel
+BuildRequires:  portmidi-java
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(SDL2_image)
 BuildRequires:  pkgconfig(SDL2_mixer)
@@ -58,15 +62,11 @@ It features:
 * MBFv21, UMAPINFO and DSDHacked specification support
 
 %prep
-%setup -q
+%autosetup -p1
-%patch -P 1 -P 2 -P 3 -p0
-%if 0%{?sle_version} < 150400
-%patch -P 4 -p0
-%endif
 
 %build
 pushd prboom2/
-%cmake -DDOOMWADDIR="%_datadir/doom"
+%cmake -DDOOMWADDIR="%_datadir/doom" -DDSDAPWADDIR="%_datadir/doom"
 %cmake_build
 popd
 
@@ -76,7 +76,6 @@ pushd prboom2/
 b="%buildroot"
 install -Dm0644 ICONS/dsda-doom.png "$b/%_datadir/icons/hicolor/apps/dsda-doom.png"
 install -Dm0644 ICONS/dsda-doom.desktop "$b/%_datadir/applications/dsda-doom.desktop"
-install -Dm0644 ICONS/dsda-doom.bash "$b/%_datadir/bash-completion/completions/dsda-doom.bash"
 popd
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1550
@@ -94,7 +93,6 @@ popd
 %_datadir/doom/
 %_datadir/applications/*.desktop
 %_datadir/icons/hicolor/apps/
-%_datadir/bash-completion/
 %doc docs/*.md
 
 %changelog

fluidsynth1.diff

@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Wed, 30 Mar 2022 21:13:50 +0200
-Subject: [PATCH] Continue supporting fluidsynth1 API
-Upstream: probably not worth, given Leap 15.4 (FL2) is around the corner
-
-Platforms such as openSUSE Leap 15.3 still only have FL1, owing
-to the branch having set off in 2017.
----
- prboom2/src/MUSIC/flplayer.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/prboom2/src/MUSIC/flplayer.c b/prboom2/src/MUSIC/flplayer.c
-index 27cd31aa..282714e8 100644
---- prboom2/src/MUSIC/flplayer.c
-+++ prboom2/src/MUSIC/flplayer.c
-@@ -231,17 +231,19 @@ static int fl_init (int samplerate)
-   }
- 
-   {
--    int lumpnum;
-+    int lumpnum = -1;
-     int checked_file = false;
-     dboolean replaced_soundfont = false;
-     const char *checked_f_font = NULL;
- 
-+#if FLUIDSYNTH_VERSION_MAJOR >= 2
-     lumpnum = W_CheckNumForName("SNDFONT");
- 
-     if (lumpnum >= 0)
-     {
-       replaced_soundfont = !W_LumpNumInPortWad(lumpnum);
-     }
-+#endif
- 
-     if (!replaced_soundfont && snd_soundfont && snd_soundfont[0])
-     {
-@@ -251,6 +253,7 @@ static int fl_init (int samplerate)
-       f_font = fluid_synth_sfload (f_syn, filename, 1);
-     }
- 
-+#if FLUIDSYNTH_VERSION_MAJOR >= 2
-     if ((!checked_file || f_font == FLUID_FAILED) && lumpnum >= 0)
-     {
-       fluid_sfloader_t *sfloader;
-@@ -262,6 +265,7 @@ static int fl_init (int samplerate)
-       fluid_synth_add_sfloader(f_syn, sfloader);
-       f_font = fluid_synth_sfload(f_syn, "SNDFONT", 1);
-     }
-+#endif
- 
-     if (!checked_f_font)
-     {
--- 
-2.35.1

prboom-nodatetime.diff

@@ -1,30 +0,0 @@
-From 2bf8068e0cd916b39fd2c57f3c9bf582b0fc45d8 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 19 Feb 2012 07:16:45 +0100
-Subject: [PATCH] Drop __DATE__/__TIME__ / enable reproducible builds
-
----
- prboom2/src/version.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git prboom2/src/version.c prboom2/src/version.c
-index 1f5401f2..2cc173f6 100644
---- prboom2/src/version.c
-+++ prboom2/src/version.c
-@@ -37,11 +37,11 @@
- #include "version.h"
- 
- #ifndef BUILD_DATE
--#define BUILD_DATE __DATE__
-+#define BUILD_DATE ""
- #endif
- 
- #ifndef BUILD_TIME
--#define BUILD_TIME __TIME__
-+#define BUILD_TIME ""
- #endif
- 
- const char version_date[] = BUILD_DATE " " BUILD_TIME;
--- 
-2.30.2
-

v0.24.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
-size 5605081

v0.27.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:956194c5dbbd8be5b62ca93cb975a6dbacdfc3ca97165c4da65a07843092b297
+size 11112601