From 569edb3a4b1b8d70178a40b025bbc4abc3e4e089 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Tue, 13 Apr 2021 20:27:40 +0200 Subject: [PATCH] scummvm: rebuild for fluidsynth-2.2.0; fix distfiles url patch adapted from https://github.com/scummvm/scummvm/commit/d0d38b0199dae9a1dbfecc53db54dd0a070694b4 --- srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff | 25 +++++++++++++++++++ srcpkgs/scummvm/template | 4 +-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff diff --git a/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff b/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff new file mode 100644 index 0000000000..c771107514 --- /dev/null +++ b/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff @@ -0,0 +1,25 @@ +--- audio/softsynth/fluidsynth.cpp ++++ audio/softsynth/fluidsynth.cpp +@@ -144,11 +144,11 @@ + return p; + } + +-static int SoundFontMemLoader_read(void *buf, int count, void *handle) { ++static int SoundFontMemLoader_read(void *buf, fluid_long_long_t 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, fluid_long_long_t offset, int origin) { + return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED; + } + +@@ -157,7 +157,7 @@ + return FLUID_OK; + } + +-static long SoundFontMemLoader_tell(void *handle) { ++static fluid_long_long_t SoundFontMemLoader_tell(void *handle) { + return ((Common::SeekableReadStream *) handle)->pos(); + } + #endif diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template index 3256722fd0..0cec3ab176 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -1,7 +1,7 @@ # Template file for 'scummvm' pkgname=scummvm version=2.2.0 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --enable-release-mode --with-sdl-prefix=${XBPS_CROSS_BASE}/usr" @@ -14,7 +14,7 @@ short_desc="Free implementation of LucasArts' SCUMM interpreter" maintainer="John " license="GPL-2.0-or-later" homepage="https://www.scummvm.org/" -distfiles="https://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz" +distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz" checksum=1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387 case "$XBPS_TARGET_MACHINE" in