Accepting request 1286512 from Emulators

- Updated to 0.82.2 * Changed dosbox-staging-name.patch. * https://www.dosbox-staging.org/releases/release-notes/0.82.2 OBS-URL: https://build.opensuse.org/request/show/1286512 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dosbox?expand=0&rev=51
Accepting request 1286511 from home:13ilya
2025-06-18 13:57:49 +00:00 · 2025-06-18 05:03:55 +00:00 · 2025-06-18 04:58:04 +00:00 · 2025-04-04 15:30:55 +00:00 · 2025-04-04 01:17:22 +00:00 · 2024-12-10 22:43:51 +00:00
7 changed files with 151 additions and 80 deletions
--- a/dosbox-staging-0.81.1.tar.gz
+++ b/dosbox-staging-0.81.1.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b389fdc338454f916240aab5a2ae5560d1dd9808d63c70f34ec9a91e60b535a
-size 7021582
--- a/dosbox-staging-0.81.2.tar.gz
+++ b/dosbox-staging-0.81.2.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6676a3b6957c144a80ca8c3ffec2a0bec0320274382f23af9c57dd1c20b2eb1b
-size 7023293
--- a/dosbox-staging-0.82.2.tar.gz
+++ b/dosbox-staging-0.82.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:387c97b373c3164ab5abbbc2b210bf94b5567057abe44ee1e8b4d4e725bd422c
+size 6691414
--- a/dosbox-staging-config.patch
+++ b/dosbox-staging-config.patch
@@ -1,60 +1,77 @@
-diff -Pdpru dosbox-staging-0.81.0.orig/src/gui/render.cpp dosbox-staging-0.81.0/src/gui/render.cpp
--- dosbox-staging-0.81.0.orig/src/gui/render.cpp	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/src/gui/render.cpp	2024-02-16 05:29:25.250435682 +0300
-@@ -1155,7 +1155,7 @@ static void init_render_settings(Section
- 	        "    options instead.");
+diff -Pdpru dosbox-staging-0.82.0.orig/src/gui/render.cpp dosbox-staging-0.82.0/src/gui/render.cpp
+--- dosbox-staging-0.82.0.orig/src/gui/render.cpp	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/src/gui/render.cpp	2024-12-10 05:45:37.585036932 +0300
+@@ -1011,10 +1011,10 @@ static void init_render_settings(Section
+ 	int_prop->Set_help(
+ 	        "Consider capping frame rates using the 'host_rate' setting.");
 
- #if C_OPENGL
-	string_prop = secprop.Add_string("glshader", always, "crt-auto");
-+	string_prop = secprop.Add_string("glshader", always, "sharp");
- 	string_prop->Set_help(
+-	auto* string_prop = secprop.Add_string("glshader", always, "crt-auto");
+	auto* string_prop = secprop.Add_string("glshader", always, "sharp");
+ 	string_prop->SetOptionHelp(
 	        "Set an adaptive CRT monitor emulation shader or a regular GLSL shader in OpenGL\n"
- 	        "output modes. Adaptive CRT shader options:\n"
-diff -Pdpru dosbox-staging-0.81.0.orig/src/gui/sdlmain.cpp dosbox-staging-0.81.0/src/gui/sdlmain.cpp
--- dosbox-staging-0.81.0.orig/src/gui/sdlmain.cpp	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/src/gui/sdlmain.cpp	2024-02-16 05:26:04.974174717 +0300
-@@ -4308,7 +4308,7 @@ static void config_add_sdl() {
- 	constexpr auto deprecated = Property::Changeable::Deprecated;
- 	constexpr auto on_start = Property::Changeable::OnlyAtStart;
+-	        "output modes ('crt-auto' by default). Adaptive CRT shader options:\n"
+	        "output modes ('sharp' by default). Adaptive CRT shader options:\n"
+ 	        "  crt-auto:               A CRT shader that prioritises developer intent and\n"
+ 	        "                          how people experienced the game at the time of\n"
+ 	        "                          release (default). The appropriate shader variant is\n"
+diff -Pdpru dosbox-staging-0.82.0.orig/src/gui/sdlmain.cpp dosbox-staging-0.82.0/src/gui/sdlmain.cpp
+--- dosbox-staging-0.82.0.orig/src/gui/sdlmain.cpp	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/src/gui/sdlmain.cpp	2024-12-10 05:53:13.278263053 +0300
+@@ -4392,9 +4392,9 @@ static void config_add_sdl()
+ 	        "Number of display to use; values depend on OS and user "
+ 	        "settings (0 by default).");
 
-	Pbool = sdl_sec->Add_bool("fullscreen", always, false);
-+	Pbool = sdl_sec->Add_bool("fullscreen", always, true);
- 	Pbool->Set_help("Start directly in fullscreen (disabled by default).\n"
- 	                "Run INTRO and see Special Keys for window control hotkeys.");
+-	auto pbool = sdl_sec->Add_bool("fullscreen", always, false);
+	auto pbool = sdl_sec->Add_bool("fullscreen", always, true);
+ 	pbool->Set_help(
+-	        "Start directly in fullscreen (disabled by default).\n"
+	        "Start directly in fullscreen (enabled by default).\n"
+ 	        "Run INTRO and see Special Keys for window control hotkeys.");
 
-diff -Pdpru dosbox-staging-0.81.0.orig/src/hardware/gus.cpp dosbox-staging-0.81.0/src/hardware/gus.cpp
--- dosbox-staging-0.81.0.orig/src/hardware/gus.cpp	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/src/hardware/gus.cpp	2024-02-16 05:20:40.799436885 +0300
-@@ -1666,7 +1666,7 @@ void init_gus_dosbox_settings(Section_pr
+ 	pstring = sdl_sec->Add_string("fullresolution", always, "desktop");
+diff -Pdpru dosbox-staging-0.82.0.orig/src/hardware/gus.cpp dosbox-staging-0.82.0/src/hardware/gus.cpp
+--- dosbox-staging-0.82.0.orig/src/hardware/gus.cpp	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/src/hardware/gus.cpp	2024-12-10 05:54:32.568244400 +0300
+@@ -1532,10 +1532,10 @@ void init_gus_dosbox_settings(Section_pr
 {
 	constexpr auto when_idle = Property::Changeable::WhenIdle;
 
-	auto *bool_prop = secprop.Add_bool("gus", when_idle, false);
-+	auto *bool_prop = secprop.Add_bool("gus", when_idle, true);
+-	auto* bool_prop = secprop.Add_bool("gus", when_idle, false);
+	auto* bool_prop = secprop.Add_bool("gus", when_idle, true);
 	assert(bool_prop);
 	bool_prop->Set_help(
- 	        "Enable Gravis UltraSound emulation (disabled by default).\n"
-diff -Pdpru dosbox-staging-0.81.0.orig/src/midi/midi.cpp dosbox-staging-0.81.0/src/midi/midi.cpp
--- dosbox-staging-0.81.0.orig/src/midi/midi.cpp	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/src/midi/midi.cpp	2024-02-16 05:23:10.121618722 +0300
-@@ -785,7 +785,7 @@ void init_midi_dosbox_settings(Section_p
- 	        "               synthesizer or physical device. This is the default behaviour.\n"
- 	        "  none:        Disable MIDI output.");
+-	        "Enable Gravis UltraSound emulation (disabled by default).\n"
+	        "Enable Gravis UltraSound emulation (enabled by default).\n"
+ 	        "The default settings of base address 240, IRQ 5, and DMA 3 have been chosen so\n"
+ 	        "the GUS can coexist with a Sound Blaster card. This works fine for the majority\n"
+ 	        "of programs, but some games and demos expect the GUS factory defaults of base\n"
+diff -Pdpru dosbox-staging-0.82.0.orig/src/midi/midi.cpp dosbox-staging-0.82.0/src/midi/midi.cpp
+--- dosbox-staging-0.82.0.orig/src/midi/midi.cpp	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/src/midi/midi.cpp	2024-12-10 05:56:35.091548900 +0300
+@@ -779,9 +779,9 @@ void init_midi_dosbox_settings(Section_p
+ 		        "none"
+ 	});
 
 -	str_prop = secprop.Add_string("midiconfig", when_idle, "");
 +	str_prop = secprop.Add_string("midiconfig", when_idle, "128:0");
 	str_prop->Set_help(
- 	        "Configuration options for the selected MIDI interface (unset by default).\n"
+-	        "Configuration options for the selected MIDI interface (unset by default).\n"
+	        "Configuration options for the selected MIDI interface ('128:0' by default).\n"
 	        "This is usually the ID or name of the MIDI synthesizer you want\n"
-diff -Pdpru dosbox-staging-0.81.0.orig/src/midi/midi_fluidsynth.cpp dosbox-staging-0.81.0/src/midi/midi_fluidsynth.cpp
--- dosbox-staging-0.81.0.orig/src/midi/midi_fluidsynth.cpp	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/src/midi/midi_fluidsynth.cpp	2024-02-16 05:24:16.459255114 +0300
-@@ -52,7 +52,7 @@ static void init_fluid_dosbox_settings(S
+ 	        "to use (find the ID/name with the DOS command 'MIXER /LISTMIDI').\n"
+ 	        "Notes:");
+diff -Pdpru dosbox-staging-0.82.0.orig/src/midi/midi_fluidsynth.cpp dosbox-staging-0.82.0/src/midi/midi_fluidsynth.cpp
+--- dosbox-staging-0.82.0.orig/src/midi/midi_fluidsynth.cpp	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/src/midi/midi_fluidsynth.cpp	2024-12-10 05:49:00.304989236 +0300
+@@ -52,9 +52,9 @@ static void init_fluid_dosbox_settings(S
 
 	// Name 'default.sf2' picks the default SoundFont if it's installed
 	// in the OS. Usually it's Fluid_R3.
 -	auto* str_prop = secprop.Add_string("soundfont", when_idle, "default.sf2");
-+	auto* str_prop = secprop.Add_string("soundfont", when_idle, "FluidR3_GM.sf2 25");
+	auto* str_prop = secprop.Add_string("soundfont", when_idle, "FluidR3_GM.sf2 20");
 	str_prop->Set_help(
- 	        "Path to a SoundFont file in .sf2 format ('default.sf2' by default).\n"
+-	        "Path to a SoundFont file in .sf2 format ('default.sf2' by default).\n"
+	        "Path to a SoundFont file in .sf2 format ('FluidR3_GM.sf2 20' by default).\n"
 	        "You can use an absolute or relative path, or the name of an .sf2 inside the\n"
+ 	        "'soundfonts' directory within your DOSBox configuration directory.\n"
+ 	        "An optional percentage value after the name will scale the SoundFont's volume.\n"
--- a/dosbox-staging-name.patch
+++ b/dosbox-staging-name.patch
@@ -1,6 +1,6 @@
-diff -Pdpru dosbox-staging-0.81.0.orig/contrib/icons/meson.build dosbox-staging-0.81.0/contrib/icons/meson.build
--- dosbox-staging-0.81.0.orig/contrib/icons/meson.build	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/contrib/icons/meson.build	2024-02-14 14:27:21.418387535 +0300
+diff -Pdpru dosbox-staging-0.82.0.orig/contrib/icons/meson.build dosbox-staging-0.82.0/contrib/icons/meson.build
+--- dosbox-staging-0.82.0.orig/contrib/icons/meson.build	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/contrib/icons/meson.build	2024-12-10 06:59:59.112412395 +0300
@@ -2,15 +2,9 @@ icons_hicolor = data_dir / 'icons' / 'hi
 
 png_files = {
@@ -21,52 +21,89 @@ diff -Pdpru dosbox-staging-0.81.0.orig/contrib/icons/meson.build dosbox-staging-
 foreach name, size : png_files
     install_data(
         'png' / name,
-        rename: 'dosbox-staging.png',
+-        rename: 'org.dosbox-staging.dosbox-staging.png',
 +        rename: 'dosbox.png',
         install_dir: icons_hicolor / size / 'apps',
     )
 endforeach
-@@ -28,5 +22,6 @@ endforeach
+@@ -28,6 +22,6 @@ endforeach
 #
 install_data(
     'svg' / 'dosbox-staging.svg',
+-    rename: 'org.dosbox-staging.dosbox-staging.svg',
 +    rename: 'dosbox.svg',
     install_dir: icons_hicolor / 'scalable' / 'apps',
 )
-diff -Pdpru dosbox-staging-0.81.0.orig/contrib/linux/dosbox-staging.desktop dosbox-staging-0.81.0/contrib/linux/dosbox-staging.desktop
--- dosbox-staging-0.81.0.orig/contrib/linux/dosbox-staging.desktop	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/contrib/linux/dosbox-staging.desktop	2024-02-14 14:29:08.799935039 +0300
-@@ -56,9 +56,9 @@ GenericName[zh_CN]=DOS 模拟器
- GenericName[zh_TW]=DOS 模擬器
- Comment=DOS/x86 emulator focusing on ease of use
+diff -Pdpru dosbox-staging-0.82.0.orig/contrib/linux/meson.build dosbox-staging-0.82.0/contrib/linux/meson.build
+--- dosbox-staging-0.82.0.orig/contrib/linux/meson.build	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/contrib/linux/meson.build	2024-12-10 06:59:59.112412395 +0300
+@@ -1,3 +1,3 @@
+-install_data('org.dosbox-staging.dosbox-staging.desktop', install_dir: data_dir / 'applications')
+install_data('org.dosbox-staging.dosbox-staging.desktop', rename: 'dosbox.desktop', install_dir: data_dir / 'applications')
+ 
+-install_data('org.dosbox-staging.dosbox-staging.metainfo.xml', install_dir: data_dir / 'metainfo')
+install_data('org.dosbox-staging.dosbox-staging.metainfo.xml', rename: 'dosbox.metainfo.xml', install_dir: data_dir / 'metainfo')
+diff -Pdpru dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.desktop dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.desktop
+--- dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.desktop	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.desktop	2024-12-10 06:59:59.112412395 +0300
+@@ -58,5 +58,5 @@
 Exec=dosbox
-Icon=dosbox-staging
+-Icon=org.dosbox-staging.dosbox-staging
 +Icon=dosbox
 Type=Application
 Terminal=false
 Keywords=dos;gaming;game;games;emulator;
- Categories=Game;Emulator;
-StartupWMClass=dosbox-staging
-+StartupWMClass=dosbox
-diff -Pdpru dosbox-staging-0.81.0.orig/contrib/linux/meson.build dosbox-staging-0.81.0/contrib/linux/meson.build
--- dosbox-staging-0.81.0.orig/contrib/linux/meson.build	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/contrib/linux/meson.build	2024-02-14 14:31:33.362018362 +0300
-@@ -1,3 +1,3 @@
-install_data('dosbox-staging.desktop', install_dir: data_dir / 'applications')
-+install_data('dosbox-staging.desktop', rename: 'dosbox.desktop', install_dir: data_dir / 'applications')
+diff -Pdpru dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml
+--- dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml	2024-12-10 06:59:59.112412395 +0300
+@@ -3,5 +3,5 @@
+ <component type="desktop">
+-  <id>org.dosbox-staging.dosbox-staging</id>
+  <id>dosbox</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <project_license>GPL-2.0-or-later</project_license>
+   <name>DOSBox Staging</name>
+@@ -67,7 +67,7 @@
+     <control>console</control>
+     <control>gamepad</control>
+   </recommends>
+-  <launchable type="desktop-id">org.dosbox-staging.dosbox-staging.desktop</launchable>
+  <launchable type="desktop-id">dosbox.desktop</launchable>
+   <developer_name>The DOSBox Staging Team</developer_name>
+   <update_contact>john@johnnovak.net</update_contact>
+   <url type="homepage">https://www.dosbox-staging.org/</url>
+diff -Pdpru dosbox-staging-0.82.0.orig/include/dosbox.h dosbox-staging-0.82.0/include/dosbox.h
+--- dosbox-staging-0.82.0.orig/include/dosbox.h	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/include/dosbox.h	2024-12-10 07:12:05.893618302 +0300
+@@ -26,7 +26,7 @@
+ #include <memory>
 
-install_data('dosbox-staging.metainfo.xml', install_dir: data_dir / 'metainfo')
-+install_data('dosbox-staging.metainfo.xml', rename: 'dosbox.metainfo.xml', install_dir: data_dir / 'metainfo')
-diff -Pdpru dosbox-staging-0.81.0.orig/meson.build dosbox-staging-0.81.0/meson.build
--- dosbox-staging-0.81.0.orig/meson.build	2024-02-11 07:55:05.000000000 +0300
-+++ dosbox-staging-0.81.0/meson.build	2024-02-14 14:34:28.501182923 +0300
-@@ -1,4 +1,4 @@
+ // Project name, lower-case and without spaces
+-#define DOSBOX_PROJECT_NAME "dosbox-staging"
+#define DOSBOX_PROJECT_NAME "dosbox"
+ 
+ // Name of the emulator
+ #define DOSBOX_NAME "DOSBox Staging"
+@@ -40,7 +40,7 @@
+ // Fully qualified application ID for the emulator; see
+ // https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names
+ // for more details
+-#define DOSBOX_APP_ID "org.dosbox-staging.dosbox-staging"
+#define DOSBOX_APP_ID "dosbox"
+ 
+ 
+ int sdl_main(int argc, char *argv[]);
+diff -Pdpru dosbox-staging-0.82.0.orig/meson.build dosbox-staging-0.82.0/meson.build
+--- dosbox-staging-0.82.0.orig/meson.build	2024-10-23 10:37:53.000000000 +0300
+++ dosbox-staging-0.82.0/meson.build	2024-12-10 06:59:59.115745745 +0300
+@@ -1,5 +1,5 @@
 project(
-    'dosbox-staging',
-+    'dosbox',
-     'c',
-     'cpp',
-@@ -35,7 +35,7 @@ project(
+-    'dosbox-staging', 'c', 'cpp',
+    'dosbox', 'c', 'cpp',
+ 
+     version: run_command(
+       meson.project_source_root() + '/scripts/get-version.sh',
+@@ -45,7 +45,7 @@ project(
 #
 data_dir = get_option('datadir')
 licenses_dir = data_dir / 'licenses' / meson.project_name()
--- a/dosbox.changes
+++ b/dosbox.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Jun 18 05:02:23 UTC 2025 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 0.82.2
+  * Changed dosbox-staging-name.patch.
+  * https://www.dosbox-staging.org/releases/release-notes/0.82.2
+
+-------------------------------------------------------------------
+Fri Apr  4 01:02:46 UTC 2025 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 0.82.1
+  * https://www.dosbox-staging.org/releases/release-notes/0.82.1
+
+-------------------------------------------------------------------
+Tue Dec 10 04:58:20 UTC 2024 - Илья Индиго <ilya@ilya.top>
+
+- Updated to 0.82.0
+  * Changed files dosbox-staging-config.patch and dosbox-staging-name.patch.
+  * https://www.dosbox-staging.org/releases/release-notes/0.82.0
+
 -------------------------------------------------------------------
 Sun Jul 21 12:39:31 UTC 2024 - Илья Индиго <ilya@ilya.top>

--- a/dosbox.spec
+++ b/dosbox.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dosbox
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@


 Name:           dosbox
-Version:        0.81.2
+Version:        0.82.2
 Release:        0
 Summary:        DOS/x86 emulator to run old DOS games
 License:        GPL-2.0-or-later