File project.diff of Package dosbox
--- dosbox-staging-config.patch.orig
+++ dosbox-staging-config.patch
@@ -1,55 +1,60 @@
-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.");
-
- #if C_OPENGL
-- string_prop = secprop.Add_string("glshader", always, "crt-auto");
-+ string_prop = secprop.Add_string("glshader", always, "sharp");
- string_prop->Set_help(
+diff --git a/src/gui/render.cpp b/src/gui/render.cpp
+index a9b3b99..0808b22 100644
+--- a/src/gui/render.cpp
++++ b/src/gui/render.cpp
+@@ -1011,7 +1011,7 @@ static void init_render_settings(Section_prop& secprop)
+ int_prop->Set_help(
+ "Consider capping frame rates using the 'host_rate' setting.");
+
+- 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;
-
-- 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.");
-
-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
+ "output modes ('crt-auto' by default). Adaptive CRT shader options:\n"
+diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
+index ab3c17a..34a575e 100644
+--- a/src/gui/sdlmain.cpp
++++ b/src/gui/sdlmain.cpp
+@@ -4392,7 +4392,7 @@ static void config_add_sdl()
+ "Number of display to use; values depend on OS and user "
+ "settings (0 by default).");
+
+- 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"
+ "Run INTRO and see Special Keys for window control hotkeys.");
+diff --git a/src/hardware/gus.cpp b/src/hardware/gus.cpp
+index 1c861fa..4013c39 100644
+--- a/src/hardware/gus.cpp
++++ b/src/hardware/gus.cpp
+@@ -1532,7 +1532,7 @@ void init_gus_dosbox_settings(Section_prop& secprop)
{
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.");
+diff --git a/src/midi/midi.cpp b/src/midi/midi.cpp
+index b538f3d..a1c4d7e 100644
+--- a/src/midi/midi.cpp
++++ b/src/midi/midi.cpp
+@@ -779,7 +779,7 @@ void init_midi_dosbox_settings(Section_prop& secprop)
+ "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"
"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
+diff --git a/src/midi/midi_fluidsynth.cpp b/src/midi/midi_fluidsynth.cpp
+index d8fbd13..fc492c4 100644
+--- a/src/midi/midi_fluidsynth.cpp
++++ b/src/midi/midi_fluidsynth.cpp
+@@ -52,7 +52,7 @@ static void init_fluid_dosbox_settings(Section_prop& secprop)
// Name 'default.sf2' picks the default SoundFont if it's installed
// in the OS. Usually it's Fluid_R3.
--- dosbox-staging-name.patch.orig
+++ dosbox-staging-name.patch
@@ -1,7 +1,8 @@
-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
-@@ -2,15 +2,9 @@ icons_hicolor = data_dir / 'icons' / 'hi
+diff --git a/contrib/icons/meson.build b/contrib/icons/meson.build
+index defe8e9..e4be41e 100644
+--- a/contrib/icons/meson.build
++++ b/contrib/icons/meson.build
+@@ -2,15 +2,9 @@ icons_hicolor = data_dir / 'icons' / 'hicolor'
png_files = {
'icon_16.png': '16x16',
@@ -21,52 +22,54 @@ diff -Pdpru dosbox-staging-0.81.0.orig/c
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 模拟器
+diff --git a/contrib/linux/meson.build b/contrib/linux/meson.build
+index 224da0c..416622a 100644
+--- a/contrib/linux/meson.build
++++ b/contrib/linux/meson.build
+@@ -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 --git a/contrib/linux/org.dosbox-staging.dosbox-staging.desktop b/contrib/linux/org.dosbox-staging.dosbox-staging.desktop
+index 099209f..4292b15 100644
+--- a/contrib/linux/org.dosbox-staging.dosbox-staging.desktop
++++ b/contrib/linux/org.dosbox-staging.dosbox-staging.desktop
+@@ -56,7 +56,7 @@ GenericName[zh_CN]=DOS 模拟器
GenericName[zh_TW]=DOS 模擬器
Comment=DOS/x86 emulator focusing on ease of use
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')
-
--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 @@
+diff --git a/meson.build b/meson.build
+index 8484424..ba7e682 100644
+--- a/meson.build
++++ b/meson.build
+@@ -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()
--- dosbox.changes.orig
+++ dosbox.changes
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Sun Oct 27 15:07:58 UTC 2024 - Martin Hauke <mardnh@gmx.de>
+
+- Update to 0.82.0
+ * https://www.dosbox-staging.org/releases/release-notes/0.82.0/
+- Update patches
+ * dosbox-staging-config.patch
+ * dosbox-staging-name.patch
+
+-------------------------------------------------------------------
Sun Jul 21 12:39:31 UTC 2024 - Илья Индиго <ilya@ilya.top>
- Updated to 0.81.2
--- dosbox.spec.orig
+++ dosbox.spec
@@ -17,7 +17,7 @@
Name: dosbox
-Version: 0.81.2
+Version: 0.82.0
Release: 0
Summary: DOS/x86 emulator to run old DOS games
License: GPL-2.0-or-later
@@ -68,7 +68,7 @@ https://github.com/dosbox-staging/dosbox
%install
%meson_install
%fdupes %{buildroot}
-rm -r %{buildroot}%{_datadir}/licenses
+rm -Rv %{buildroot}%{_datadir}/licenses
%check
%meson_test
@@ -78,9 +78,36 @@ rm -r %{buildroot}%{_datadir}/licenses
%doc AUTHORS README README.md docs/README.video THANKS
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1%{?ext_man}
+### mit den patches
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.{png,svg}
%{_datadir}/metainfo/%{name}.metainfo.xml
%{_datadir}/%{name}
+###
+
+####
+#%%{_datadir}/applications/%{name}.desktop
+#%%{_datadir}/icons/hicolor/*/apps/%{name}-staging.{png,svg}
+#%%{_datadir}/metainfo/%{name}-staging.metainfo.xml
+#%%{_datadir}/%{name}-staging
+#####
+#%/usr/share/applications/org.dosbox-staging.dosbox-staging.desktop
+#%%dir /usr/share/doc/dosbox-staging
+#%/usr/share/doc/dosbox-staging/AUTHORS
+#%/usr/share/doc/dosbox-staging/README
+#%/usr/share/doc/dosbox-staging/THANKS
+#%/usr/share/icons/hicolor/1024x1024/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/128x128/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/16x16/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/22x22/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/24x24/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/256x256/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/32x32/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/48x48/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/512x512/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/96x96/apps/org.dosbox-staging.dosbox-staging.png
+#%/usr/share/icons/hicolor/scalable/apps/org.dosbox-staging.dosbox-staging.svg
+#%/usr/share/metainfo/org.dosbox-staging.dosbox-staging.metainfo.xml
+#%%{_datadir}/%{name}-staging
%changelog
