From 3174a3c53f502eb69c7ab885da8402514519c1b2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Oct 2021 10:57:20 +0200 Subject: [PATCH] scummvm: update to 2.5.0. --- srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff | 25 ------------------- srcpkgs/scummvm/template | 11 ++++---- 2 files changed, 5 insertions(+), 31 deletions(-) delete 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 deleted file mode 100644 index c7c9b50d4887..000000000000 --- a/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- a/audio/softsynth/fluidsynth.cpp -+++ b/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 0cec3ab176d7..81c975b063c2 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -1,21 +1,20 @@ # Template file for 'scummvm' pkgname=scummvm -version=2.2.0 -revision=2 +version=2.5.0 +revision=1 build_style=configure -configure_args="--prefix=/usr --enable-release-mode - --with-sdl-prefix=${XBPS_CROSS_BASE}/usr" +configure_args="--prefix=/usr --enable-release-mode" hostmakedepends="pkg-config nasm" makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel freetype-devel libjpeg-turbo-devel libcurl-devel SDL2_net-devel - libmpeg2-devel liba52-devel" + libmpeg2-devel liba52-devel gtk+3-devel" short_desc="Free implementation of LucasArts' SCUMM interpreter" maintainer="John " license="GPL-2.0-or-later" homepage="https://www.scummvm.org/" distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387 +checksum=b47ee4b195828d2c358e38a4088eda49886dc37a04f1cc17b981345a59e0d623 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*);;