Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dosbox for openSUSE:Factory checked in at 2021-10-04 18:40:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosbox (Old) and /work/SRC/openSUSE:Factory/.dosbox.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosbox" Mon Oct 4 18:40:19 2021 rev:37 rq:922869 version:0.77.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dosbox/dosbox.changes 2021-06-02 22:12:47.812070515 +0200 +++ /work/SRC/openSUSE:Factory/.dosbox.new.2443/dosbox.changes 2021-10-04 18:42:09.022270523 +0200 @@ -1,0 +2,13 @@ +Sun Oct 3 17:48:00 UTC 2021 - ???????? ???????????? <i...@ilya.pp.ua> + +- Updated to dosbox-staging 0.77.1. + * Removed old patches dosbox-0.71-manpage.diff dosbox-0.74-3-mt32-patch.diff. + * Removed old files dosbox.desktop dosbox.png CONFIG-midi-mt32-gm. + * Added patch dosbox-staging-0.77.1-config.patch. + * Added patch dosbox-staging-0.77.1-name.patch. + * Addad translations subpackage. + * Disabled "gtest soft_limiter" test for 32-bit architectures and Leap. + * Added support: Opus, FLAC, MT32, GM, GUS, Raw mouse input and more. + * https://github.com/dosbox-staging/dosbox-staging#readme + +------------------------------------------------------------------- Old: ---- CONFIG-midi-mt32-gm dosbox-0.71-manpage.diff dosbox-0.74-3-mt32-patch.diff dosbox-0.74-3.tar.gz dosbox.desktop dosbox.png New: ---- dosbox-staging-0.77.1-config.patch dosbox-staging-0.77.1-name.patch dosbox-staging-0.77.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosbox.spec ++++++ --- /var/tmp/diff_new_pack.GBxnGh/_old 2021-10-04 18:42:09.498271297 +0200 +++ /var/tmp/diff_new_pack.GBxnGh/_new 2021-10-04 18:42:09.502271303 +0200 @@ -17,74 +17,83 @@ Name: dosbox -Version: 0.74.3 +Version: 0.77.1 Release: 0 -Summary: DOS Emulator Well-Suited for Playing Games -License: GPL-2.0-or-later AND GPL-3.0-only -Group: System/Emulators/PC -URL: https://www.dosbox.com -Source: https://downloads.sf.net/dosbox/dosbox-0.74-3.tar.gz -Source1: dosbox.desktop -Source2: dosbox.png -Source3: CONFIG-midi-mt32-gm -Patch0: dosbox-0.71-manpage.diff -# Patch from https://github.com/munt/munt/releases the latest release libmt32emu. -Patch1: dosbox-0.74-3-mt32-patch.diff -BuildRequires: SDL_sound-devel -BuildRequires: automake -BuildRequires: desktop-file-utils +Summary: A modernized DOSBox to run old DOS games +License: GPL-2.0-or-later +URL: https://%{name}-staging.github.io +Source0: https://github.com/%{name}-staging/%{name}-staging/archive/v%{version}.tar.gz#/%{name}-staging-%{version}.tar.gz +Patch0: %{name}-staging-0.77.1-config.patch +Patch1: %{name}-staging-0.77.1-name.patch BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme +BuildRequires: meson >= 0.54.2 BuildRequires: pkgconfig -BuildRequires: pkgconfig(SDL_net) +BuildRequires: pkgconfig(SDL2_net) BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gtest) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(sdl) -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 +BuildRequires: pkgconfig(opusfile) +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(zlib) +Requires: %{name}-translations = %{version} +Recommends: fluid-soundfont-gm +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +BuildRequires: pkgconfig(fluidsynth) >= 2.0 BuildRequires: pkgconfig(mt32emu) %endif %description -dosbox is a DOS emulator that, thanks to its good graphics and sound -emulation, is exceptionally well-suited for playing games. dosbox -features a built-in DOS operating system and transparent access to the -Linux file system and is therefore very easy to use. +%{name}-staging is DOS/x86 emulator focusing on ease of use. +Based on DOSBox, it is a fork which use modern library (e.g.: sdl2) and +practice in an attempt to revitalize the development process. +DOSBox Staging is an attempt to revitalize DOSBox's development process. +It's not a rewrite, but a continuation and improvement on the existing +DOSBox codebase while leveraging modern development tools and practices. +Added support: Opus, FLAC, MT32, GM, GUS, Raw mouse input and more. +https://github.com/dosbox-staging/dosbox-staging#readme + +%package translations +Summary: Translations for %{name}-staging +Requires: %{name} = %{version} +BuildArch: noarch + +%description translations +This package contains translations for %{name}-staging. %prep -%setup -q -n dosbox-0.74-3 -%patch0 -p1 -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 -%patch1 -p1 +%autosetup -p1 -n %{name}-staging-%{version} +%if "%{?_lib}" == "lib" || (0%{?suse_version} < 1550 && 0%{?sle_version} < 150400) +sed -i 's/.*soft_limit.*//' tests/meson.build %endif %build -autoreconf -f -i -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags} -fno-strict-aliasing" -%configure -%make_build - -%check -%make_build check +%meson \ +%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150400 +-Duse_fluidsynth=false -Duse_mt32emu=false +%endif +%meson_build %install -%make_install -install -dpm0755 %{buildroot}%{_datadir}/pixmaps -install -pm0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/dosbox.png -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 -install -pm0644 %{SOURCE3} . -%endif +%meson_install +mkdir -p %{buildroot}%{_datadir}/%{name}/translations +install -pm0644 contrib/translations/??/*.lng %{buildroot}%{_datadir}/%{name}/translations + +%check +%meson_test %files %license COPYING -%doc AUTHORS ChangeLog NEWS README THANKS -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 -%doc CONFIG-midi-mt32-gm -%endif -%{_bindir}/dosbox -%{_mandir}/man?/* -%{_datadir}/applications/* -%{_datadir}/pixmaps/* +%doc AUTHORS README README.md docs/README.video THANKS +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.{png,svg} +%{_datadir}/metainfo/%{name}.metainfo.xml + +%files translations +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/translations +%{_datadir}/%{name}/translations/*.lng %changelog ++++++ dosbox-staging-0.77.1-config.patch ++++++ diff -Pdpru dosbox-staging-0.77.1.orig/src/dosbox.cpp dosbox-staging-0.77.1/src/dosbox.cpp --- dosbox-staging-0.77.1.orig/src/dosbox.cpp 2021-08-28 21:35:58.000000000 +0300 +++ dosbox-staging-0.77.1/src/dosbox.cpp 2021-08-29 04:59:31.522271121 +0300 @@ -465,7 +465,7 @@ void DOSBOX_Init(void) { "low", "splash_only", "quiet", "auto", 0}; - Pstring = secprop->Add_string("startup_verbosity", only_at_start, "high"); + Pstring = secprop->Add_string("startup_verbosity", only_at_start, "medium"); Pstring->Set_values(verbosity_choices); Pstring->Set_help( "Controls verbosity prior to displaying the program:\n" @@ -498,7 +498,7 @@ void DOSBOX_Init(void) { pstring->Set_values(mono_pal); pmulti = secprop->Add_multi("scaler", always, " "); - pmulti->SetValue("none"); + pmulti->SetValue("hq3x"); pmulti->Set_help("Scaler used to enlarge/enhance low resolution modes.\n" "If 'forced' is appended, then the scaler will be used even if\n" "the result might not be desired.\n" @@ -571,12 +571,12 @@ void DOSBOX_Init(void) { Pstring = Pmulti_remain->GetSection()->Add_string("parameters",Property::Changeable::Always,""); - Pint = secprop->Add_int("cycleup",Property::Changeable::Always,10); + Pint = secprop->Add_int("cycleup",Property::Changeable::Always,500); Pint->SetMinMax(1,1000000); Pint->Set_help("Number of cycles added or subtracted with speed control hotkeys.\n" "Run INTRO and see Special Keys for list of hotkeys."); - Pint = secprop->Add_int("cycledown",Property::Changeable::Always,20); + Pint = secprop->Add_int("cycledown",Property::Changeable::Always,500); Pint->SetMinMax(1,1000000); Pint->Set_help("Setting it lower than 100 will be a percentage."); @@ -597,7 +597,7 @@ void DOSBOX_Init(void) { Pbool = secprop->Add_bool("nosound",Property::Changeable::OnlyAtStart,false); Pbool->Set_help("Enable silent mode, sound is still emulated though."); - Pint = secprop->Add_int("rate",Property::Changeable::OnlyAtStart,44100); + Pint = secprop->Add_int("rate",Property::Changeable::OnlyAtStart,48000); Pint->Set_values(rates); Pint->Set_help("Mixer sample rate, setting any device's rate higher than this will probably lower their sound quality."); @@ -656,7 +656,7 @@ void DOSBOX_Init(void) { "'auto', to use the first working external MIDI player. This\n" " might be a software synthesizer or physical device."); - pstring = secprop->Add_string("midiconfig", when_idle, ""); + pstring = secprop->Add_string("midiconfig", when_idle, "128:0"); pstring->Set_help( "Configuration options for the selected MIDI interface.\n" "This is usually the id or name of the MIDI synthesizer you want\n" @@ -763,7 +763,7 @@ void DOSBOX_Init(void) { // have worked with when tuning their game audio, we therefore use this // same value given it's the most likely to produce audio as intended by // the authors. - pint = secprop->Add_int("pcrate", when_idle, 18939); + pint = secprop->Add_int("pcrate", when_idle, 48000); pint->SetMinMax(8000, 48000); pint->Set_help("Sample rate of the PC-Speaker sound generation."); @@ -959,6 +959,8 @@ void DOSBOX_Init(void) { MSG_Add("AUTOEXEC_CONFIGFILE_HELP", "Lines in this section will be run at startup.\n" "You can put your MOUNT lines here.\n" + "mount C .\n" + "C:\n" ); MSG_Add("CONFIGFILE_INTRO", "# This is the configuration file for dosbox-staging (%s).\n" diff -Pdpru dosbox-staging-0.77.1.orig/src/gui/sdlmain.cpp dosbox-staging-0.77.1/src/gui/sdlmain.cpp --- dosbox-staging-0.77.1.orig/src/gui/sdlmain.cpp 2021-08-28 21:35:58.000000000 +0300 +++ dosbox-staging-0.77.1/src/gui/sdlmain.cpp 2021-08-29 04:48:19.341560070 +0300 @@ -3012,7 +3012,7 @@ 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.\n" "Run INTRO and see Special Keys for window control hotkeys."); @@ -3027,7 +3027,7 @@ void Config_Add_SDL() { Pstring->Set_help("What resolution to use for fullscreen: 'original', 'desktop'\n" "or a fixed size (e.g. 1024x768)."); - pstring = sdl_sec->Add_string("windowresolution", on_start, "default"); + pstring = sdl_sec->Add_string("windowresolution", on_start, "original"); pstring->Set_help( "Set window size when running in windowed mode:\n" " default: Select the best option based on your\n" @@ -3111,7 +3111,7 @@ void Config_Add_SDL() { Pint = Pmulti->GetSection()->Add_int("ysens",Property::Changeable::Always,100); Pint->SetMinMax(-1000,1000); - pbool = sdl_sec->Add_bool("raw_mouse_input", on_start, false); + pbool = sdl_sec->Add_bool("raw_mouse_input", on_start, true); pbool->Set_help( "Enable this setting to bypass your operating system's mouse\n" "acceleration and sensitivity settings. This works in\n" diff -Pdpru dosbox-staging-0.77.1.orig/src/midi/midi_fluidsynth.cpp dosbox-staging-0.77.1/src/midi/midi_fluidsynth.cpp --- dosbox-staging-0.77.1.orig/src/midi/midi_fluidsynth.cpp 2021-08-28 21:35:58.000000000 +0300 +++ dosbox-staging-0.77.1/src/midi/midi_fluidsynth.cpp 2021-08-29 05:48:55.768978755 +0300 @@ -46,9 +46,9 @@ static void init_fluid_dosbox_settings(S { constexpr auto when_idle = Property::Changeable::WhenIdle; - // 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"); + // Name 'FluidR3_GM.sf2 25' picks the default soundfont if it's installed + // in the OS. In openSUSE it's FluidR3_GM.sf2 25. + auto *str_prop = secprop.Add_string("soundfont", when_idle, "FluidR3_GM.sf2 25"); str_prop->Set_help( "Path to a SoundFont file in .sf2 format. You can use an\n" "absolute or relative path, or the name of an .sf2 inside\n" ++++++ dosbox-staging-0.77.1-name.patch ++++++ diff -Pdpru dosbox-staging-0.77.1.orig/contrib/icons/meson.build dosbox-staging-0.77.1/contrib/icons/meson.build --- dosbox-staging-0.77.1.orig/contrib/icons/meson.build 2021-08-28 21:35:58.000000000 +0300 +++ dosbox-staging-0.77.1/contrib/icons/meson.build 2021-10-03 18:27:15.914070806 +0300 @@ -3,11 +3,11 @@ icons_hicolor = data_dir / 'icons' / 'hi # small pre-rendered raster icons # foreach size : ['16x16', '22x22', '24x24', '32x32'] - install_data('small-png' / size / 'dosbox-staging.png', + install_data('small-png' / size / 'dosbox-staging.png', rename : 'dosbox.png', install_dir : icons_hicolor / size / 'apps') endforeach # scalable vector icon # -install_data('dosbox-staging.svg', +install_data('dosbox-staging.svg', rename : 'dosbox.svg', install_dir : icons_hicolor / 'scalable' / 'apps') diff -Pdpru dosbox-staging-0.77.1.orig/contrib/linux/dosbox-staging.desktop dosbox-staging-0.77.1/contrib/linux/dosbox-staging.desktop --- dosbox-staging-0.77.1.orig/contrib/linux/dosbox-staging.desktop 2021-08-28 21:35:58.000000000 +0300 +++ dosbox-staging-0.77.1/contrib/linux/dosbox-staging.desktop 2021-10-03 18:22:18.482052904 +0300 @@ -56,9 +56,9 @@ GenericName[zh_CN]=DOS ????????? GenericName[zh_TW]=DOS ????????? Comment=DOS/x86 emulator focusing on ease of use Exec=dosbox -Icon=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.77.1.orig/contrib/linux/meson.build dosbox-staging-0.77.1/contrib/linux/meson.build --- dosbox-staging-0.77.1.orig/contrib/linux/meson.build 2021-08-28 21:35:58.000000000 +0300 +++ dosbox-staging-0.77.1/contrib/linux/meson.build 2021-10-03 18:29:12.207641515 +0300 @@ -1,5 +1,5 @@ -install_data('dosbox-staging.desktop', +install_data('dosbox-staging.desktop', rename : 'dosbox.desktop', install_dir : data_dir / 'applications') -install_data('dosbox-staging.metainfo.xml', +install_data('dosbox-staging.metainfo.xml', rename : 'dosbox.metainfo.xml', install_dir : data_dir / 'metainfo') diff -Pdpru dosbox-staging-0.77.1.orig/meson.build dosbox-staging-0.77.1/meson.build --- dosbox-staging-0.77.1.orig/meson.build 2021-08-28 21:35:58.000000000 +0300 +++ dosbox-staging-0.77.1/meson.build 2021-10-03 18:42:23.094315697 +0300 @@ -353,8 +353,8 @@ executable('dosbox', ['src/main.cpp', 's # additional files for installation # data_dir = get_option('datadir') -licenses_dir = data_dir / 'licenses' / 'dosbox-staging' -doc_dir = data_dir / 'doc' / 'dosbox-staging' +licenses_dir = data_dir / 'licenses' / 'dosbox' +doc_dir = data_dir / 'doc' / 'packages' / 'dosbox' install_man('docs/dosbox.1') install_data('COPYING', install_dir : licenses_dir)
