diff options
| author | B. Watson <yalhcru@gmail.com> | 2020-04-11 17:57:10 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-04-19 10:52:24 +0700 |
| commit | 895fd8d1f9ce94be83afe4830048c241ea4e2608 (patch) | |
| tree | c661eec47be736286b999aa529a3f1d9f331e978 | |
| parent | 343fee2f5327aa2d2ad54c5eb5246cd8d59415ef (diff) | |
| download | slackbuilds-895fd8d1f9ce94be83afe4830048c241ea4e2608.tar.gz | |
games/scummvm: Updated for version 2.1.2, fix build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | games/scummvm/fix-fluidsynth2-build.diff | 27 | ||||
| -rw-r--r-- | games/scummvm/scummvm.SlackBuild | 7 | ||||
| -rw-r--r-- | games/scummvm/scummvm.info | 6 |
3 files changed, 36 insertions, 4 deletions
diff --git a/games/scummvm/fix-fluidsynth2-build.diff b/games/scummvm/fix-fluidsynth2-build.diff new file mode 100644 index 0000000000..db7edcd335 --- /dev/null +++ b/games/scummvm/fix-fluidsynth2-build.diff @@ -0,0 +1,27 @@ +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 1a54e58fe9..c0a8a400f7 100644 --- a/games/scummvm/scummvm.SlackBuild +++ b/games/scummvm/scummvm.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=scummvm -VERSION=${VERSION:-2.1.1} +VERSION=${VERSION:-2.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,8 +72,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# 20200411 bkw: This is necessary for fluidsynth-2.x. Based on upstream's +# git commit 68758a87. +patch -p1 < $CWD/fix-fluidsynth2-build.diff + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="-fuse-ld=gold" \ ./configure \ --prefix=/usr \ --bindir=/usr/games \ diff --git a/games/scummvm/scummvm.info b/games/scummvm/scummvm.info index afe8aaddfc..dbc0117305 100644 --- a/games/scummvm/scummvm.info +++ b/games/scummvm/scummvm.info @@ -1,8 +1,8 @@ PRGNAM="scummvm" -VERSION="2.1.1" +VERSION="2.1.2" HOMEPAGE="https://www.scummvm.org/" -DOWNLOAD="https://www.scummvm.org/frs/scummvm/2.1.1/scummvm-2.1.1.tar.xz" -MD5SUM="d75fec6358f7814b47d6aca5e18c9863" +DOWNLOAD="https://www.scummvm.org/frs/scummvm/2.1.2/scummvm-2.1.2.tar.xz" +MD5SUM="dd680a1f0f3a6745bf3a8033167ee778" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |