CVS commit: pkgsrc/games/scummvm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr  6 22:04:37 UTC 2021

Modified Files:
        pkgsrc/games/scummvm: distinfo
Added Files:
        pkgsrc/games/scummvm/patches: patch-audio_softsynth_fluidsynth.cpp

Log Message:
scummvm: fix build with fluidsynth 2.2.0


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/games/scummvm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/scummvm/patches/patch-audio_softsynth_fluidsynth.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/scummvm/distinfo
diff -u pkgsrc/games/scummvm/distinfo:1.51 pkgsrc/games/scummvm/distinfo:1.52
--- pkgsrc/games/scummvm/distinfo:1.51  Tue Sep 29 08:44:25 2020
+++ pkgsrc/games/scummvm/distinfo       Tue Apr  6 22:04:36 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.51 2020/09/29 08:44:25 adam Exp $
+$NetBSD: distinfo,v 1.52 2021/04/06 22:04:36 wiz Exp $
 
 SHA1 (scummvm-2.2.0.tar.xz) = 237018173c4ac4a9ea5b8bd6feb2fdb2e2be920d
 RMD160 (scummvm-2.2.0.tar.xz) = 3011e4d66fd3b5e28029afbd894a9cd7df9e9ec1
 SHA512 (scummvm-2.2.0.tar.xz) = 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
 Size (scummvm-2.2.0.tar.xz) = 63652348 bytes
 SHA1 (patch-aa) = eedd2949184813d6089ffdf7df348d57625aa29f
+SHA1 (patch-audio_softsynth_fluidsynth.cpp) = 6e4b0da9b7c17ff881ee42af74393bc2c2cade55

Added files:

Index: pkgsrc/games/scummvm/patches/patch-audio_softsynth_fluidsynth.cpp
diff -u /dev/null pkgsrc/games/scummvm/patches/patch-audio_softsynth_fluidsynth.cpp:1.1
--- /dev/null   Tue Apr  6 22:04:37 2021
+++ pkgsrc/games/scummvm/patches/patch-audio_softsynth_fluidsynth.cpp   Tue Apr  6 22:04:36 2021
@@ -0,0 +1,29 @@
+$NetBSD: patch-audio_softsynth_fluidsynth.cpp,v 1.1 2021/04/06 22:04:36 wiz Exp $
+
+Fix build with fluidsynth 2.2.0
+
+--- audio/softsynth/fluidsynth.cpp.orig        2020-09-13 21:05:37.000000000 +0000
++++ audio/softsynth/fluidsynth.cpp
+@@ -144,11 +144,11 @@ static void *SoundFontMemLoader_open(con
+       return p;
+ }
+ 
+-static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
++static int SoundFontMemLoader_read(void *buf, long long count, void *handle) {
+       return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
+ }
+ 
+-static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
++static int SoundFontMemLoader_seek(void *handle, long long offset, int origin) {
+       return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
+ }
+ 
+@@ -157,7 +157,7 @@ static int SoundFontMemLoader_close(void
+       return FLUID_OK;
+ }
+ 
+-static long SoundFontMemLoader_tell(void *handle) {
++static long long SoundFontMemLoader_tell(void *handle) {
+       return ((Common::SeekableReadStream *) handle)->pos();
+ }
+ #endif