diff options
| -rw-r--r-- | games/scummvm/fix-fluidsynth2-build.diff | 27 | ||||
| -rw-r--r-- | games/scummvm/scummvm.SlackBuild | 4 | ||||
| -rw-r--r-- | games/scummvm/scummvm.info | 6 |
3 files changed, 5 insertions, 32 deletions
diff --git a/games/scummvm/fix-fluidsynth2-build.diff b/games/scummvm/fix-fluidsynth2-build.diff deleted file mode 100644 index db7edcd335c88..0000000000000 --- a/games/scummvm/fix-fluidsynth2-build.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur scummvm-2.1.2/audio/softsynth/fluidsynth.cpp scummvm-2.1.2.patched/audio/softsynth/fluidsynth.cpp ---- scummvm-2.1.2/audio/softsynth/fluidsynth.cpp 2020-03-30 18:32:51.000000000 -0400 -+++ scummvm-2.1.2.patched/audio/softsynth/fluidsynth.cpp 2020-04-11 17:40:39.247407731 -0400 -@@ -20,10 +20,13 @@ - * - */ - --#include "common/scummsys.h" -+#include "config.h" - - #ifdef USE_FLUIDSYNTH - -+#include <fluidsynth.h> -+ -+#include "common/scummsys.h" - #include "common/config-manager.h" - #include "common/error.h" - #include "common/system.h" -@@ -35,8 +38,6 @@ - #include "backends/platform/ios7/ios7_common.h" - #endif - --#include <fluidsynth.h> -- - class MidiDriver_FluidSynth : public MidiDriver_Emulated { - private: - MidiChannel_MPU401 _midiChannels[16]; diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild index 268f100592e7a..6a2650450f818 100644 --- a/games/scummvm/scummvm.SlackBuild +++ b/games/scummvm/scummvm.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=scummvm -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-2.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,7 +84,7 @@ find -L . \ # 20200411 bkw: This is necessary for fluidsynth-2.x. Based on upstream's # git commit 68758a87. -patch -p1 < $CWD/fix-fluidsynth2-build.diff +#patch -p1 < $CWD/fix-fluidsynth2-build.diff # avoid linking breakage on i?86 if [[ $ARCH == i?86 ]]; then linker=bfd; else linker=gold; fi diff --git a/games/scummvm/scummvm.info b/games/scummvm/scummvm.info index bb2af9ad602b5..5f4b94a939124 100644 --- a/games/scummvm/scummvm.info +++ b/games/scummvm/scummvm.info @@ -1,8 +1,8 @@ PRGNAM="scummvm" -VERSION="2.1.2" +VERSION="2.5.1" HOMEPAGE="https://www.scummvm.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/scummvm-2.1.2.tar.xz" -MD5SUM="dd680a1f0f3a6745bf3a8033167ee778" +DOWNLOAD="https://downloads.scummvm.org/frs/scummvm/2.5.1/scummvm-2.5.1.tar.xz" +MD5SUM="79f7541e404f575a37bfa6be448c4046" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |