Accepting request 1238567 from games

- Update to release 0.28.3

OBS-URL: https://build.opensuse.org/request/show/1238567
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dsda-doom?expand=0&rev=7

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1737134872
+commit: 58375212ffdacf56968070b24cf2180320115b4b7c31f3f2b60ff566ee610da4
+url: https://src.opensuse.org/jengelh/dsda-doom
+revision: master

build.specials.obscpio

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

dsda-doom.changes

@@ -1,54 +1,3 @@
--------------------------------------------------------------------
-Thu Jul  3 14:56:47 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 0.29.3
-  * Fixed wrong save slot being deleted when quicksaving
-  * Fixed a crash in Hexen
-  * Fixed building dsda-doom.wad in big-endian hosts
-  * Improved statusbar color background algorithm
-
--------------------------------------------------------------------
-Fri Jun 27 07:58:23 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 0.29.2
-  * Clickable demo progress bar
-  * Multiple quicksave support
-  * Customizable view and weapon bob config
-  * Colored statusbar backgrounds
-  * WAD lookup now includes XDG directories
-  * Cutoff MIDI notes at end of song before looping
-  * Linedef action 272 had erroneously not changed the sky
-  * Replace DUMB by OpenMPT as tracker music engine
-  * Level brightness adjuster (this is different from
-    Gamma correction) [config-only, not selectable in UI]
-  * MAPINFO Skill Definition support
-
--------------------------------------------------------------------
-Thu Apr 10 09:15:03 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 0.29
-  * Reorganized all menus
-  * Strict mode is now On by default when recording demos
-  * Don't allow saving the game on strict mode
-  * Added support for reading GAMEINFO lump ("iwad" field only)
-  * Added config option for toggling aspect ratio correction
-  * Added linear sky scrolling option for Software renderer
-  * Added smooth chainsaw bobbing (only when Uncapped FPS is on)
-  * Remove SysEx support from FluidSynth midi player
-  * automap: New colors for "Alt Secret Exit line" and
-    "Tag Finder line"
-  * Checks if a map exists before changing music with IDMUS
-  * New cheat SKILL
-
--------------------------------------------------------------------
-Thu Mar 20 21:37:51 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Remove unused BuildRequire on libpcre. (The feature using pcre
-  was dropped in 2022 already.)
-- Add BuildRequire on pkgconfig(glu), previously implicitly added
-  by SDL2-devel (but now we have sdl2-compat-devel).
-- Make build recipe POSIX sh compatible.
-
 -------------------------------------------------------------------
 Fri Jan 17 17:25:07 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
 

dsda-doom.spec

@@ -17,7 +17,7 @@
 
 
 Name:           dsda-doom
-Version:        0.29.3
+Version:        0.28.3
 Release:        0
 Summary:        DOOM source port with Hexen support and demo compatibility
 License:        GPL-2.0-or-later
@@ -33,28 +33,21 @@ 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)
 BuildRequires:  pkgconfig(SDL2_net)
-BuildRequires:  pkgconfig(fluidsynth)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(libopenmpt)
-BuildRequires:  pkgconfig(libzip)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(portmidi)
 BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(vorbis)
-%if 0%{?suse_version} >= 1600
-# CMake Error at [portmidi-devel]:/usr/lib64/cmake/PortMidi/PortMidiTargets.cmake:100 (message):
-#   The imported target "PortMidi::pmjni" references the file
-#      "[portmidi-java]:/usr/lib64/libpmjni.so.2.0.3"
-BuildRequires:  portmidi-java
-%endif
 Suggests:       freedoom
 Provides:       prboom
 
@@ -71,14 +64,16 @@ It features:
 %autosetup -p1
 
 %build
-cd prboom2/
-%cmake -DDOOMWADDIR="%_datadir/doom" -DDSDAPWADDIR="%_datadir/doom" -D_IMPORT_PREFIX=$PWD/usr
+pushd prboom2/
+%cmake -DDOOMWADDIR="%_datadir/doom" -DDSDAPWADDIR="%_datadir/doom"
 %cmake_build
+popd
 
 %install
-cd prboom2/
+pushd prboom2/
 %cmake_install
 rm -f "%buildroot/usr/share/doc/dsda-doom/COPYING" # via %%license instead
+popd
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1550
 %post

prboom-hbar-all.diff

@@ -9,21 +9,21 @@ showing it for other destructible objects (such as barrels - or DEH
 modifications in that spirit) can be used to gauge the objects'
 remaining life.
 ---
- prboom2/src/dsda/configuration.c |    4 ++++
- prboom2/src/dsda/configuration.h |    1 +
- prboom2/src/dsda/settings.c      |    5 +++++
- prboom2/src/dsda/settings.h      |    1 +
- prboom2/src/gl_intern.h          |    1 +
- prboom2/src/gl_main.c            |   13 ++++++++++---
- prboom2/src/m_menu.c             |    1 +
- prboom2/src/m_misc.c             |    1 +
+ prboom2/src/dsda/configuration.c |  4 ++++
+ prboom2/src/dsda/configuration.h |  1 +
+ prboom2/src/dsda/settings.c      |  5 +++++
+ prboom2/src/dsda/settings.h      |  1 +
+ prboom2/src/gl_intern.h          |  1 +
+ prboom2/src/gl_main.c            | 13 ++++++++++---
+ prboom2/src/m_menu.c             |  1 +
+ prboom2/src/m_misc.c             |  1 +
  8 files changed, 24 insertions(+), 3 deletions(-)
 
-Index: dsda-doom-0.29.2/prboom2/src/dsda/configuration.c
+Index: dsda-doom-0.28.0/prboom2/src/dsda/configuration.c
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/dsda/configuration.c
-+++ dsda-doom-0.29.2/prboom2/src/dsda/configuration.c
-@@ -625,6 +625,10 @@ dsda_config_t dsda_config[dsda_config_co
+--- dsda-doom-0.28.0.orig/prboom2/src/dsda/configuration.c
++++ dsda-doom-0.28.0/prboom2/src/dsda/configuration.c
+@@ -604,6 +604,10 @@ dsda_config_t dsda_config[dsda_config_co
      "gl_health_bar", dsda_config_gl_health_bar,
      CONF_BOOL(0), NULL, STRICT_INT(0)
    },
@@ -34,11 +34,11 @@ Index: dsda-doom-0.29.2/prboom2/src/dsda/configuration.c
    [dsda_config_gl_usevbo] = {
      "gl_usevbo", dsda_config_gl_usevbo,
      CONF_BOOL(1), NULL, NOT_STRICT
-Index: dsda-doom-0.29.2/prboom2/src/dsda/configuration.h
+Index: dsda-doom-0.28.0/prboom2/src/dsda/configuration.h
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/dsda/configuration.h
-+++ dsda-doom-0.29.2/prboom2/src/dsda/configuration.h
-@@ -124,6 +124,7 @@ typedef enum {
+--- dsda-doom-0.28.0.orig/prboom2/src/dsda/configuration.h
++++ dsda-doom-0.28.0/prboom2/src/dsda/configuration.h
+@@ -121,6 +121,7 @@ typedef enum {
    dsda_config_gl_render_multisampling,
    dsda_config_gl_render_fov,
    dsda_config_gl_health_bar,
@@ -46,10 +46,10 @@ Index: dsda-doom-0.29.2/prboom2/src/dsda/configuration.h
    dsda_config_gl_usevbo,
    dsda_config_gl_fade_mode,
    dsda_config_use_mouse,
-Index: dsda-doom-0.29.2/prboom2/src/dsda/settings.c
+Index: dsda-doom-0.28.0/prboom2/src/dsda/settings.c
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/dsda/settings.c
-+++ dsda-doom-0.29.2/prboom2/src/dsda/settings.c
+--- dsda-doom-0.28.0.orig/prboom2/src/dsda/settings.c
++++ dsda-doom-0.28.0/prboom2/src/dsda/settings.c
 @@ -251,6 +251,11 @@ dboolean dsda_ShowHealthBars(void) {
    return dsda_IntConfig(dsda_config_gl_health_bar);
  }
@@ -62,10 +62,10 @@ Index: dsda-doom-0.29.2/prboom2/src/dsda/settings.c
  dboolean dsda_WipeAtFullSpeed(void) {
    return dsda_IntConfig(dsda_config_wipe_at_full_speed);
  }
-Index: dsda-doom-0.29.2/prboom2/src/dsda/settings.h
+Index: dsda-doom-0.28.0/prboom2/src/dsda/settings.h
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/dsda/settings.h
-+++ dsda-doom-0.29.2/prboom2/src/dsda/settings.h
+--- dsda-doom-0.28.0.orig/prboom2/src/dsda/settings.h
++++ dsda-doom-0.28.0/prboom2/src/dsda/settings.h
 @@ -50,6 +50,7 @@ dboolean dsda_ShowMinimap(void);
  dboolean dsda_ShowLevelSplits(void);
  dboolean dsda_ShowDemoAttempts(void);
@@ -74,10 +74,10 @@ Index: dsda-doom-0.29.2/prboom2/src/dsda/settings.h
  dboolean dsda_MapCoordinates(void);
  dboolean dsda_MapTotals(void);
  dboolean dsda_MapTime(void);
-Index: dsda-doom-0.29.2/prboom2/src/gl_intern.h
+Index: dsda-doom-0.28.0/prboom2/src/gl_intern.h
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/gl_intern.h
-+++ dsda-doom-0.29.2/prboom2/src/gl_intern.h
+--- dsda-doom-0.28.0.orig/prboom2/src/gl_intern.h
++++ dsda-doom-0.28.0/prboom2/src/gl_intern.h
 @@ -216,6 +216,7 @@ typedef enum
    health_bar_null,
    health_bar_red,
@@ -86,11 +86,11 @@ Index: dsda-doom-0.29.2/prboom2/src/gl_intern.h
  } health_bar_color_t;
  
  typedef struct
-Index: dsda-doom-0.29.2/prboom2/src/gl_main.c
+Index: dsda-doom-0.28.0/prboom2/src/gl_main.c
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/gl_main.c
-+++ dsda-doom-0.29.2/prboom2/src/gl_main.c
-@@ -2072,12 +2072,18 @@ static void gld_DrawSprite(GLSprite *spr
+--- dsda-doom-0.28.0.orig/prboom2/src/gl_main.c
++++ dsda-doom-0.28.0/prboom2/src/gl_main.c
+@@ -2031,12 +2031,18 @@ static void gld_DrawSprite(GLSprite *spr
  
  static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite)
  {
@@ -111,7 +111,7 @@ Index: dsda-doom-0.29.2/prboom2/src/gl_main.c
      if (health_percent <= 50)
        hbar.color = health_bar_red;
      else if (health_percent <= 99)
-@@ -2104,10 +2110,11 @@ static void gld_AddHealthBar(mobj_t* thi
+@@ -2063,10 +2069,11 @@ static void gld_AddHealthBar(mobj_t* thi
    }
  }
  
@@ -124,23 +124,23 @@ Index: dsda-doom-0.29.2/prboom2/src/gl_main.c
  };
  
  static void gld_DrawHealthBars(void)
-Index: dsda-doom-0.29.2/prboom2/src/m_menu.c
+Index: dsda-doom-0.28.0/prboom2/src/m_menu.c
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/m_menu.c
-+++ dsda-doom-0.29.2/prboom2/src/m_menu.c
-@@ -3379,6 +3379,7 @@ setup_menu_t display_options_settings[]
-   { "Linear Sky Scrolling", S_YESNO, m_conf, G_X, dsda_config_render_linearsky },
-   { "Quake Intensity", S_NUM, m_conf, G_X, dsda_config_quake_intensity },
+--- dsda-doom-0.28.0.orig/prboom2/src/m_menu.c
++++ dsda-doom-0.28.0/prboom2/src/m_menu.c
+@@ -3155,6 +3155,7 @@ setup_menu_t demo_settings[] = {
+   { "Coop Spawns", S_YESNO, m_conf, G_X, dsda_config_coop_spawns },
+   { "Allow Jumping", S_YESNO, m_conf, G_X, dsda_config_allow_jumping },
    { "OpenGL Show Health Bars", S_YESNO, m_conf, G_X, dsda_config_gl_health_bar },
 +  { "All Shootables have Health Bar", S_YESNO, m_conf, G_X, dsda_config_gl_health_bar_shootables },
-   { "Translucent Sprites", S_CHOICE, m_conf, G_X, dsda_config_translucent_sprites, 0, translucent_list },
-   { "Translucent Ghosts", S_YESNO, m_conf, G_X, dsda_config_translucent_ghosts },
-   EMPTY_LINE,
-Index: dsda-doom-0.29.2/prboom2/src/m_misc.c
+ 
+   PREV_PAGE(mapping_settings),
+   NEXT_PAGE(tas_settings),
+Index: dsda-doom-0.28.0/prboom2/src/m_misc.c
 ===================================================================
---- dsda-doom-0.29.2.orig/prboom2/src/m_misc.c
-+++ dsda-doom-0.29.2/prboom2/src/m_misc.c
-@@ -177,6 +177,7 @@ cfg_def_t cfg_defs[] =
+--- dsda-doom-0.28.0.orig/prboom2/src/m_misc.c
++++ dsda-doom-0.28.0/prboom2/src/m_misc.c
+@@ -171,6 +171,7 @@ cfg_def_t cfg_defs[] =
    MIGRATED_SETTING(dsda_config_gl_render_fov),
    MIGRATED_SETTING(dsda_config_gl_skymode),
    MIGRATED_SETTING(dsda_config_gl_health_bar),