Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dosbox for openSUSE:Factory checked in at 2022-10-17 14:57:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosbox (Old) and /work/SRC/openSUSE:Factory/.dosbox.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosbox" Mon Oct 17 14:57:48 2022 rev:40 rq:1011273 version:0.79.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dosbox/dosbox.changes 2022-05-24 22:50:14.375213892 +0200 +++ /work/SRC/openSUSE:Factory/.dosbox.new.2275/dosbox.changes 2022-10-17 14:57:49.886107893 +0200 @@ -1,0 +2,12 @@ +Sat Oct 15 23:12:46 UTC 2022 - ???????? ???????????? <i...@ilya.cf> + +- Updated to dosbox-staging 0.79.1 + * Replaced dosbox-staging-0.78.1-config.patch by dosbox-staging-0.79.1-config.patch. + * Replaced dosbox-staging-0.78.1-name.patch by dosbox-staging-0.79.1-name.patch. + * Removed dosbox-translations subpackage and added Provides/Obsoletes instructions. + * Added fdupes, pkgconfig(iir), pkgconfig(slirp) dependencies. + * Removed irrelevant instructions and enabled fluidsynth and mt32emu for Leap. + * https://dosbox-staging.github.io/v0-79-0/#changes + * https://dosbox-staging.github.io/v0-79-1/#changes + +------------------------------------------------------------------- Old: ---- dosbox-staging-0.78.1-config.patch dosbox-staging-0.78.1-name.patch dosbox-staging-0.78.1.tar.gz New: ---- dosbox-staging-0.79.1-config.patch dosbox-staging-0.79.1-name.patch dosbox-staging-0.79.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosbox.spec ++++++ --- /var/tmp/diff_new_pack.FK10DP/_old 2022-10-17 14:57:50.546109161 +0200 +++ /var/tmp/diff_new_pack.FK10DP/_new 2022-10-17 14:57:50.554109176 +0200 @@ -17,32 +17,34 @@ Name: dosbox -Version: 0.78.1 +Version: 0.79.1 Release: 0 -Summary: A modernized DOSBox to run old DOS games +Summary: DOS/x86 emulator 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.78.1-config.patch -Patch1: %{name}-staging-0.78.1-name.patch +Patch0: %{name}-staging-0.79.1-config.patch +Patch1: %{name}-staging-0.79.1-name.patch +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: meson >= 0.54.2 +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(SDL2_net) BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(fluidsynth) >= 2.2.3 BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(gtest) +BuildRequires: pkgconfig(iir) BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(mt32emu) BuildRequires: pkgconfig(opusfile) BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(slirp) BuildRequires: pkgconfig(zlib) -Requires: %{name}-translations = %{version} Recommends: fluid-soundfont-gm -%if 0%{?suse_version} >= 1550 -BuildRequires: pkgconfig(fluidsynth) >= 2.2.3 -BuildRequires: pkgconfig(mt32emu) -%endif +Provides: %{name}-translations = %{version} +Obsoletes: %{name}-translations < %{version} %description %{name}-staging is DOS/x86 emulator focusing on ease of use. @@ -54,30 +56,16 @@ 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 %autosetup -p1 -n %{name}-staging-%{version} -%if "%{?_lib}" == "lib" || (0%{?suse_version} < 1550) -sed -i 's/.*soft_limit.*//' tests/meson.build -%endif %build -%meson -Duse_slirp=false \ -%if 0%{?suse_version} < 1550 --Duse_fluidsynth=false -Duse_mt32emu=false \ -%endif - +%meson %meson_build %install %meson_install +%fdupes %{buildroot} %check %meson_test @@ -90,10 +78,6 @@ %{_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 +%{_datadir}/%{name} %changelog ++++++ dosbox-staging-0.78.1-config.patch -> dosbox-staging-0.79.1-config.patch ++++++ --- /work/SRC/openSUSE:Factory/dosbox/dosbox-staging-0.78.1-config.patch 2022-05-24 22:50:14.339213888 +0200 +++ /work/SRC/openSUSE:Factory/.dosbox.new.2275/dosbox-staging-0.79.1-config.patch 2022-10-17 14:57:49.470107094 +0200 @@ -1,27 +1,18 @@ -diff -Pdpru dosbox-staging-0.78.1.orig/src/dosbox.cpp dosbox-staging-0.78.1/src/dosbox.cpp ---- dosbox-staging-0.78.1.orig/src/dosbox.cpp 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/src/dosbox.cpp 2022-05-24 17:47:11.357668107 +0300 -@@ -516,7 +516,7 @@ void DOSBOX_Init() { - const char *verbosity_choices[] = { - "auto", "high", "medium", "low", "splash_only", "quiet", 0, - }; -- Pstring = secprop->Add_string("startup_verbosity", only_at_start, "auto"); -+ 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" -@@ -549,7 +549,7 @@ void DOSBOX_Init() { - pstring->Set_values(mono_pal); +diff -Pdpru dosbox-staging-0.79.1.orig/src/dosbox.cpp dosbox-staging-0.79.1/src/dosbox.cpp +--- dosbox-staging-0.79.1.orig/src/dosbox.cpp 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/src/dosbox.cpp 2022-10-15 19:16:47.469396803 +0300 +@@ -624,7 +624,7 @@ void DOSBOX_Init() + "RGB triplets (e.g. (255, 0, 255) for magenta)."); - pmulti = secprop->Add_multi("scaler", always, " "); + pmulti = secprop->AddMultiVal("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" -@@ -626,12 +626,12 @@ void DOSBOX_Init() { +@@ -701,12 +701,12 @@ void DOSBOX_Init() - Pmulti_remain->GetSection()->Add_string("parameters", always, ""); + pmulti_remain->GetSection()->Add_string("parameters", always, ""); - Pint = secprop->Add_int("cycleup", always, 10); + Pint = secprop->Add_int("cycleup", always, 500); @@ -34,7 +25,7 @@ Pint->SetMinMax(1,1000000); Pint->Set_help("Setting it lower than 100 will be a percentage."); -@@ -715,7 +715,7 @@ void DOSBOX_Init() { +@@ -771,7 +771,7 @@ void DOSBOX_Init() "'auto', to use the first working external MIDI player. This\n" " might be a software synthesizer or physical device."); @@ -43,20 +34,11 @@ 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" -@@ -829,7 +829,7 @@ void DOSBOX_Init() { - // 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."); - -diff -Pdpru dosbox-staging-0.78.1.orig/src/gui/sdlmain.cpp dosbox-staging-0.78.1/src/gui/sdlmain.cpp ---- dosbox-staging-0.78.1.orig/src/gui/sdlmain.cpp 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/src/gui/sdlmain.cpp 2022-05-24 17:51:25.785165473 +0300 -@@ -3432,7 +3432,7 @@ void Config_Add_SDL() { - // constexpr auto deprecated = Property::Changeable::Deprecated; +diff -Pdpru dosbox-staging-0.79.1.orig/src/gui/sdlmain.cpp dosbox-staging-0.79.1/src/gui/sdlmain.cpp +--- dosbox-staging-0.79.1.orig/src/gui/sdlmain.cpp 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/src/gui/sdlmain.cpp 2022-10-04 23:15:38.000000000 +0300 +@@ -4109,7 +4109,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); @@ -64,7 +46,7 @@ Pbool->Set_help("Start directly in fullscreen.\n" "Run INTRO and see Special Keys for window control hotkeys."); -@@ -3444,7 +3444,7 @@ void Config_Add_SDL() { +@@ -4121,7 +4121,7 @@ void Config_Add_SDL() { Pstring->Set_help("What resolution to use for fullscreen: 'original', 'desktop'\n" "or a fixed size (e.g. 1024x768)."); @@ -73,7 +55,7 @@ pstring->Set_help( "Set window size when running in windowed mode:\n" " default: Select the best option based on your\n" -@@ -3554,7 +3554,7 @@ void Config_Add_SDL() { +@@ -4256,7 +4256,7 @@ void Config_Add_SDL() { Pint = Pmulti->GetSection()->Add_int("ysens", always,100); Pint->SetMinMax(-1000,1000); @@ -82,10 +64,22 @@ 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.78.1.orig/src/midi/midi_fluidsynth.cpp dosbox-staging-0.78.1/src/midi/midi_fluidsynth.cpp ---- dosbox-staging-0.78.1.orig/src/midi/midi_fluidsynth.cpp 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/src/midi/midi_fluidsynth.cpp 2022-05-24 17:52:23.585946162 +0300 -@@ -50,7 +50,7 @@ static void init_fluid_dosbox_settings(S +diff -Pdpru dosbox-staging-0.79.1.orig/src/hardware/gus.cpp dosbox-staging-0.79.1/src/hardware/gus.cpp +--- dosbox-staging-0.79.1.orig/src/hardware/gus.cpp 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/src/hardware/gus.cpp 2022-10-15 19:20:07.759957010 +0300 +@@ -1610,7 +1610,7 @@ 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); + assert(bool_prop); + bool_prop->Set_help("Enable Gravis UltraSound emulation."); + +diff -Pdpru dosbox-staging-0.79.1.orig/src/midi/midi_fluidsynth.cpp dosbox-staging-0.79.1/src/midi/midi_fluidsynth.cpp +--- dosbox-staging-0.79.1.orig/src/midi/midi_fluidsynth.cpp 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/src/midi/midi_fluidsynth.cpp 2022-10-04 23:17:09.000000000 +0300 +@@ -49,7 +49,7 @@ 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. ++++++ dosbox-staging-0.78.1-name.patch -> dosbox-staging-0.79.1-name.patch ++++++ --- /work/SRC/openSUSE:Factory/dosbox/dosbox-staging-0.78.1-name.patch 2022-05-24 22:50:14.363213891 +0200 +++ /work/SRC/openSUSE:Factory/.dosbox.new.2275/dosbox-staging-0.79.1-name.patch 2022-10-17 14:57:49.606107355 +0200 @@ -1,23 +1,26 @@ -diff -Pdpru dosbox-staging-0.78.1.orig/contrib/icons/meson.build dosbox-staging-0.78.1/contrib/icons/meson.build ---- dosbox-staging-0.78.1.orig/contrib/icons/meson.build 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/contrib/icons/meson.build 2022-05-24 17:57:53.078396467 +0300 -@@ -3,11 +3,11 @@ icons_hicolor = data_dir / 'icons' / 'hi - # small pre-rendered raster icons +diff -Pdpru dosbox-staging-0.79.1.orig/contrib/icons/meson.build dosbox-staging-0.79.1/contrib/icons/meson.build +--- dosbox-staging-0.79.1.orig/contrib/icons/meson.build 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/contrib/icons/meson.build 2022-10-04 23:23:51.000000000 +0300 +@@ -4,7 +4,7 @@ icons_hicolor = data_dir / 'icons' / 'hi # 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') + install_data( +- 'small-png' / size / 'dosbox-staging.png', ++ 'small-png' / size / 'dosbox-staging.png', rename : 'dosbox.png', + install_dir: icons_hicolor / size / 'apps', + ) endforeach - +@@ -12,6 +12,6 @@ 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.78.1.orig/contrib/linux/dosbox-staging.desktop dosbox-staging-0.78.1/contrib/linux/dosbox-staging.desktop ---- dosbox-staging-0.78.1.orig/contrib/linux/dosbox-staging.desktop 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/contrib/linux/dosbox-staging.desktop 2022-05-24 17:59:28.267682145 +0300 + install_data( +- 'dosbox-staging.svg', ++ 'dosbox-staging.svg', rename : 'dosbox.svg', + install_dir: icons_hicolor / 'scalable' / 'apps', + ) +diff -Pdpru dosbox-staging-0.79.1.orig/contrib/linux/dosbox-staging.desktop dosbox-staging-0.79.1/contrib/linux/dosbox-staging.desktop +--- dosbox-staging-0.79.1.orig/contrib/linux/dosbox-staging.desktop 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/contrib/linux/dosbox-staging.desktop 2022-10-04 23:24:58.000000000 +0300 @@ -56,9 +56,9 @@ GenericName[zh_CN]=DOS ????????? GenericName[zh_TW]=DOS ????????? Comment=DOS/x86 emulator focusing on ease of use @@ -30,54 +33,31 @@ Categories=Game;Emulator; -StartupWMClass=dosbox-staging +StartupWMClass=dosbox -diff -Pdpru dosbox-staging-0.78.1.orig/contrib/linux/meson.build dosbox-staging-0.78.1/contrib/linux/meson.build ---- dosbox-staging-0.78.1.orig/contrib/linux/meson.build 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/contrib/linux/meson.build 2022-05-24 18:00:32.000542956 +0300 +diff -Pdpru dosbox-staging-0.79.1.orig/contrib/linux/meson.build dosbox-staging-0.79.1/contrib/linux/meson.build +--- dosbox-staging-0.79.1.orig/contrib/linux/meson.build 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/contrib/linux/meson.build 2022-10-04 23:28:08.000000000 +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.79.1.orig/meson.build dosbox-staging-0.79.1/meson.build +--- dosbox-staging-0.79.1.orig/meson.build 2022-09-30 18:59:10.000000000 +0300 ++++ dosbox-staging-0.79.1/meson.build 2022-10-15 01:22:43.668982095 +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.78.1.orig/contrib/translations/meson.build dosbox-staging-0.78.1/contrib/translations/meson.build ---- dosbox-staging-0.78.1.orig/contrib/translations/meson.build 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/contrib/translations/meson.build 2022-05-24 18:03:18.242788315 +0300 -@@ -49,7 +49,7 @@ endforeach - - # Setup the translation files in the system - if get_option('prefix') in ['/usr', '/usr/local'] -- system_translations = get_option('prefix') / 'share/dosbox-staging/translations' -+ system_translations = get_option('prefix') / 'share/dosbox/translations' - foreach source_file, target_name : translations_files - install_data(builddir_translations / target_name, - install_dir : system_translations) -diff -Pdpru dosbox-staging-0.78.1.orig/meson.build dosbox-staging-0.78.1/meson.build ---- dosbox-staging-0.78.1.orig/meson.build 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/meson.build 2022-05-24 18:04:41.503912885 +0300 -@@ -469,8 +469,8 @@ subdir('tests') - # additional files for installation + project( +- 'dosbox-staging', ++ 'dosbox', + 'c', + 'cpp', + version: '0.79.1', +@@ -32,7 +32,7 @@ project( # - 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' + data_dir = get_option('datadir') + licenses_dir = data_dir / 'licenses' / meson.project_name() +-doc_dir = data_dir / 'doc' / meson.project_name() ++doc_dir = data_dir / 'doc' / 'packages' / meson.project_name() install_man('docs/dosbox.1') - install_data('COPYING', install_dir : licenses_dir) -diff -Pdpru dosbox-staging-0.78.1.orig/src/misc/messages.cpp dosbox-staging-0.78.1/src/misc/messages.cpp ---- dosbox-staging-0.78.1.orig/src/misc/messages.cpp 2022-01-07 18:37:04.000000000 +0300 -+++ dosbox-staging-0.78.1/src/misc/messages.cpp 2022-05-24 18:12:01.735417977 +0300 -@@ -239,8 +239,8 @@ static std::deque<std_fs::path> get_path - - // Try the user-installed and then repo-installed paths, which - // can exist on macOS, POSIX, and even MinGW/MSYS2/Cygwin. -- paths.emplace_back("/usr/local/share/dosbox-staging/translations"); -- paths.emplace_back("/usr/share/dosbox-staging/translations"); -+ paths.emplace_back("/usr/local/share/dosbox/translations"); -+ paths.emplace_back("/usr/share/dosbox/translations"); - - // Worst-cast: fallback to the user's config directory - const std_fs::path config_path(CROSS_GetPlatformConfigDir()); + install_data('COPYING', install_dir: licenses_dir) ++++++ dosbox-staging-0.78.1.tar.gz -> dosbox-staging-0.79.1.tar.gz ++++++ ++++ 288803 lines of diff (skipped)
