diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,11 +1,17 @@ libFLAC.so.8 libSDL2-2.0.so.0 +libSDL2_net-2.0.so.0 +liba52.so.0 libasound.so.2 libc.so.6 +libcurl.so.4 libfaad.so.2 libfluidsynth.so.2 libfreetype.so.6 -libgcc_s.so.1 +libfribidi.so.0 +libglib-2.0.so.0 +libgobject-2.0.so.0 +libgtk-3.so.0 libjpeg.so.8 libm.so.6 libmad.so.0 diff --git a/files/Fix-compilation-against-fluidsynth-2.1.patch b/files/Fix-compilation-against-fluidsynth-2.1.patch deleted file mode 100644 --- a/files/Fix-compilation-against-fluidsynth-2.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6 Mon Sep 17 00:00:00 2001 -From: D G Turner -Date: Sun, 15 Dec 2019 22:22:20 +0000 -Subject: [PATCH] AUDIO: Fix Compilation Against Fluidsynth v2.1+ - -This is as reported by eriktorbjorn. ---- - audio/softsynth/fluidsynth.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp -index 4034b2ffc36..33a74a15247 100644 ---- a/audio/softsynth/fluidsynth.cpp -+++ b/audio/softsynth/fluidsynth.cpp -@@ -35,7 +35,12 @@ - #include "backends/platform/ios7/ios7_common.h" - #endif - -+// Fluidsynth v2.1+ uses printf in one of it's headers, so this is -+// needed to allow compilation, as reported by eriktorbjorn on 20191215 -+// This is in include/fluidsynth/log.h around line 82 -+#define FORBIDDEN_SYMBOL_EXCEPTION_printf - #include -+#undef FORBIDDEN_SYMBOL_EXCEPTION_printf - - class MidiDriver_FluidSynth : public MidiDriver_Emulated { - private: diff --git a/files/Really-fix-compilation-against-fluidsynth-2.1.patch b/files/Really-fix-compilation-against-fluidsynth-2.1.patch deleted file mode 100644 --- a/files/Really-fix-compilation-against-fluidsynth-2.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 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 | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp -index 33a74a15247..f8c2412492e 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" -@@ -35,13 +41,6 @@ - #include "backends/platform/ios7/ios7_common.h" - #endif - --// Fluidsynth v2.1+ uses printf in one of it's headers, so this is --// needed to allow compilation, as reported by eriktorbjorn on 20191215 --// This is in include/fluidsynth/log.h around line 82 --#define FORBIDDEN_SYMBOL_EXCEPTION_printf --#include --#undef FORBIDDEN_SYMBOL_EXCEPTION_printf -- - class MidiDriver_FluidSynth : public MidiDriver_Emulated { - private: - MidiChannel_MPU401 _midiChannels[16]; diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,37 +1,38 @@ name : scummvm -version : 2.1.1 -release : 15 +version : 2.2.0 +release : 16 source : - - https://github.com/scummvm/scummvm/archive/v2.1.1.tar.gz : b5d70a9f2d146861589207b9f609ba270917c7ec3725305b3bf94ee90843b734 -license : GPL-2.0-only + - https://github.com/scummvm/scummvm/archive/v2.2.0.tar.gz : ccb73ef62a8316a2fe9c7ba2827409099b1ac02a43ace3702afe9ff4c6c3ecc2 +license : + - BSD-3-Clause + - GPL-2.0-or-later + - GPL-3.0-or-later WITH Font-exception-2.0 + - LGPL-2.1-or-later + - OFL-1.1 component : games.emulator summary : ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files description: | ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! builddeps : + - pkgconfig(SDL2_net) - pkgconfig(alsa) - - pkgconfig(freetype2) - pkgconfig(flac) - pkgconfig(fluidsynth) + - pkgconfig(gtk+-3.0) + - pkgconfig(libcurl) - pkgconfig(libmpeg2) - - pkgconfig(libopenjp2) - pkgconfig(libturbojpeg) - - pkgconfig(sdl2) - pkgconfig(theoradec) - pkgconfig(vorbisfile) - - pkgconfig(x11) - faad-devel + - liba52dec-devel - libmad-devel setup : | - %patch -p1 < $pkgfiles/Fix-compilation-against-fluidsynth-2.1.patch - %patch -p1 < $pkgfiles/Really-fix-compilation-against-fluidsynth-2.1.patch - ./configure --prefix=/usr + ./configure --enable-c++11 --enable-release --prefix=/usr build : | %make install : | %make_install rm -fr $installdir/usr/share/doc - - install -D -m00644 dists/scummvm.desktop $installdir/usr/share/applications/scummvm.desktop check : | %make test diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,10 +2,14 @@ scummvm - F. von Gellhorn - flinux@vongellhorn.ch + Alexander Vorobyev + avorobyev@protonmail.com - GPL-2.0-only + BSD-3-Clause + GPL-2.0-or-later + GPL-3.0-or-later WITH Font-exception-2.0 + LGPL-2.1-or-later + OFL-1.1 games.emulator ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! @@ -20,10 +24,10 @@ games.emulator /usr/bin/scummvm - /usr/share/appdata/scummvm.appdata.xml /usr/share/applications/scummvm.desktop /usr/share/icons/hicolor/scalable/apps/scummvm.svg /usr/share/man/man6/scummvm.6 + /usr/share/metainfo/scummvm.appdata.xml /usr/share/pixmaps/scummvm.xpm /usr/share/scummvm/access.dat /usr/share/scummvm/cryomni3d.dat @@ -46,17 +50,19 @@ /usr/share/scummvm/tony.dat /usr/share/scummvm/toon.dat /usr/share/scummvm/translations.dat + /usr/share/scummvm/ultima.dat /usr/share/scummvm/wintermute.zip + /usr/share/scummvm/wwwroot.zip /usr/share/scummvm/xeen.ccs - - 2020-03-12 - 2.1.1 + + 2020-10-03 + 2.2.0 Packaging update - F. von Gellhorn - flinux@vongellhorn.ch + Alexander Vorobyev + avorobyev@protonmail.com \ No newline at end of file