From ef32601aa6b392c9d9c0a0968ed658848aae3fd1f8312fb3610fdb62d3b5b6e9 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 1 Oct 2020 20:30:51 +0000 Subject: [PATCH] Accepting request 839024 from home:Mailaender:branches:games new upstream release OBS-URL: https://build.opensuse.org/request/show/839024 OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=61 --- ...-Compilation-Against-Fluidsynth-v2.1.patch | 42 ------------------- scummvm-2.1.2.tar.xz | 3 -- scummvm-2.2.0.tar.xz | 3 ++ scummvm.changes | 8 ++++ scummvm.spec | 8 +--- 5 files changed, 13 insertions(+), 51 deletions(-) delete mode 100644 0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch delete mode 100644 scummvm-2.1.2.tar.xz create mode 100644 scummvm-2.2.0.tar.xz diff --git a/0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch b/0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch deleted file mode 100644 index 893e861..0000000 --- a/0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a28b89dd848a4effdee601576cad42f982454039 Mon Sep 17 00:00:00 2001 -From: D G Turner -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 -+ -+#include "common/scummsys.h" - #include "common/config-manager.h" - #include "common/error.h" - #include "common/system.h" --- -2.24.1 - diff --git a/scummvm-2.1.2.tar.xz b/scummvm-2.1.2.tar.xz deleted file mode 100644 index a80495f..0000000 --- a/scummvm-2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4c16c9b8650c3d512b7254551bbab0d47cd3ef4eac6983ab6d882e76cf88eb0 -size 27056972 diff --git a/scummvm-2.2.0.tar.xz b/scummvm-2.2.0.tar.xz new file mode 100644 index 0000000..786cec0 --- /dev/null +++ b/scummvm-2.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387 +size 63652348 diff --git a/scummvm.changes b/scummvm.changes index c93c292..96e0118 100644 --- a/scummvm.changes +++ b/scummvm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 1 16:46:47 UTC 2020 - Matthias Mailänder + +- Drop 0001-AUDIO-Really-Fix-Compilation-Against-Fluidsynth-v2.1.patch +- Update to version 2.2.0 + * Add support for ~1594 Interactive Fiction games + * Adds 3 more game engines and extended another 4 + ------------------------------------------------------------------- Sat Aug 22 09:24:57 UTC 2020 - Dirk Mueller diff --git a/scummvm.spec b/scummvm.spec index 3388577..28f57c3 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -20,15 +20,13 @@ %bcond_with libmpeg2 %bcond_without mad Name: scummvm -Version: 2.1.2 +Version: 2.2.0 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 @@ -81,7 +79,6 @@ 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 @@ -117,8 +114,7 @@ make %{?_smp_mflags} %{_datadir}/scummvm %{_mandir}/man6/scummvm.6* %{_datadir}/applications/scummvm.desktop -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/scummvm.appdata.xml +%{_datadir}/metainfo/scummvm.appdata.xml %{_datadir}/icons/hicolor/*/*/* %{_datadir}/pixmaps/scummvm.xpm %{_docdir}/%{name}