Accepting request 767974 from games

OBS-URL: https://build.opensuse.org/request/show/767974
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scummvm?expand=0&rev=19

0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch

@@ -0,0 +1,42 @@
+From a28b89dd848a4effdee601576cad42f982454039 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Tue, 17 Dec 2019 04:21:04 +0000
+Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+
+The previous fix did not work as the forbidden exception had no effect
+since scummsys.h and thus forbidden.h had already been included prior
+to the fluidsynth header being included. This also meant that undefining
+the exception define after the header would have had no effect anyway.
+
+This new solution was suggest by eriktorbjorn on bug #11278 and should
+avoid the need to add an exception which would persist over the entire
+source file.
+---
+ audio/softsynth/fluidsynth.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index 4034b2f..21891d6 100644
+--- a/audio/softsynth/fluidsynth.cpp
++++ b/audio/softsynth/fluidsynth.cpp
+@@ -20,10 +20,16 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
+-- 
+2.24.1
+

scummvm-2.1.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727
-size 27188916

scummvm-2.1.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5753769356f3396fde1e614b40496c61392a2903c53ca436b721dde58353dca8
+size 27291080

scummvm.changes

@@ -1,3 +1,110 @@
+-------------------------------------------------------------------
+Tue Jan 28 09:21:28 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 2.1.1
+  General:
+  * Fixed crash when switching certain languages in GUI.
+  * Fixed ESC erroneously saving the changes in the options dialog.
+  * Improvements in FM-TOWNS/PC-98 audio.
+  * Improved Greek language support in the GUI.
+
+  Networking:
+  * Improved error handling.
+  * Only download saves when necessary.
+
+  Bladerunner:
+  * Fixed buggy savestate in some scenes.
+  * Added engine checkbox to target 120fps.
+  * Fixed thumbnail portability.
+  * Use virtual keyboard on save screen on relevant platforms.
+
+  Kyra:
+  * Fixed EOB1-Amiga ending sequence (which would play only if you
+    achieved all bonus quests).
+  * Fixed monster random item drop chance in EOB1.
+  * Added handling for the secret potion in the Legend of Kyrandia 2.
+  * Fixed sound issues in the Legend of Kyrandia 2.
+  * Fixed graphics glitches in Legend of Kyrandia 1 and 3, EOB1 and
+    EOB2-FM-TOWNS.
+
+  Mohawk:
+  * Persist changes in game options across sessions.
+
+  Queen:
+  * Fixed regression with the display of the bellboy dialogue.
+
+  SCI:
+  * Numerous game script fixes in CAMELOT, ECO2, GK1, GK2,
+     KQ7, PHANT1, PQ1VGA, QFG3, QFG4, SQ5 and SQ6.
+  * Implement horizontal and FM-TOWNS type screen shake.
+  * Added support for Phantasmagoria 1 censored mode.
+  * Added support for Polish LSL7.
+  * Added support for Italian GK2.
+  * Added support for Portuguese GK2.
+  * Added support for Russian KQ7.
+  * Added support for Russian SQ1VGA.
+  * Added support for GK2 fan-made subtitle patches.
+
+  SCUMM:
+  * Added support for Pajama2 (UK release).
+
+  Supernova:
+  * Hooked F5 to the Main Menu.
+
+  Toltecs:
+  * Added Czech version support.
+  * Fixed exiting from game menus when returning to the launcher.
+
+  Wintermute:
+  * Added several missing game variants and demos to the detection tables.
+  * Fixed regression with stack handling.
+  * Fixed the behavior of edit boxes.
+  * Improved support for Chinese language game variants.
+
+  Xeen:
+  * Fixed display of gold and gem amounts on the Switch.
+  * Fixed tavern exit locations in Swords of Xeen.
+  * Fixed crash loading Deep Mine Alpha in World of Xeen CD.
+
+  GUI:
+  * MIDI setting tabs are no longer shown if a game has no music at all.
+
+  All ports:
+  * Fixed screen filling in non-paletted screen modes.
+
+  3DS port:
+  * Major improvements.
+
+  AmigaOS4 port:
+  * Minor tweaks (stack cookie, build automation).
+
+  Android port:
+  * Improved filesystem navigation.
+  * Proper handling of HiDPI displays.
+  * Improved keyboard support.
+
+  iOS port:
+  * The home indicator is now automatically hidden on iPhone X and later models.
+
+  MacOS X port:
+  * Follow the OS dark theme for window decorations.
+
+  RISC OS port:
+  * Fixed crash when accessing an unavailable drive.
+  * Reduced the required DigitalRenderer version.
+
+  Switch port:
+  * Added cloud integration.
+
+  OpenPandora port:
+  * Minor improvements.
+
+  Windows:
+  * Added Text-to-Speech support.
+  * Fix screenshots with Unicode paths.
+- Add 0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch
+  to fix build with fluidsynth 2.1
+
 -------------------------------------------------------------------
 Mon Dec  9 15:01:25 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
 

scummvm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package scummvm
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,13 +20,15 @@
 %bcond_with libmpeg2
 %bcond_without mad
 Name:           scummvm
-Version:        2.1.0
+Version:        2.1.1
 Release:        0
 Summary:        Interpreter for several adventure games
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Other
 URL:            https://www.scummvm.org/
 Source:         https://www.scummvm.org/frs/scummvm/%{version}/scummvm-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
@@ -79,6 +81,8 @@ These engines are in a worse state, but allow to play extra games.
 
 %prep
 %setup -q
+%patch0 -p1
+
 # build the endianness test without optimization otherwise gcc is too smart
 # and optimize everything away, making the test fail
 sed -i '/tmp_endianness_check.cpp/ s/$CXXFLAGS/$CXXFLAGS -fno-lto -O0/' configure
@@ -106,16 +110,9 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-%post
-%icon_theme_cache_post
-%desktop_database_post
-
-%postun
-%icon_theme_cache_postun
-%desktop_database_postun
-
 %files
 %defattr(0644,root,root,0755)
+%license COPYING*
 %attr(0755,-,-) %{_bindir}/scummvm
 %{_datadir}/scummvm
 %{_mandir}/man6/scummvm.6*