jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

scummvm: update to 2.5.0.

Browse source 
scummvm now includes residualvm
This commit is contained in:
John 2021-10-05 10:57:20 +02:00 committed by John Zimmermann
parent e9c599486a
commit 8243767beb
6 changed files with 12 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/residualvm Symbolic link
View file

@ -0,0 +1 @@
scummvm

29
srcpkgs/residualvm/patches/fluidsynth-2.1.patch
View file

@ -1,29 +0,0 @@
--- a/audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000
+++ b/audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000
@@ -20,10 +20,16 @@
*
*/
-#include "common/scummsys.h"
+#include "config.h"
#ifdef USE_FLUIDSYNTH
+// Fluidsynth v2.1+ uses printf in one of it's headers,
+// include/fluidsynth/log.h around line 82 so need to include this
+// prior scummsys.h inclusion and thus forbidden.h
+#include <fluidsynth.h>
+
+#include "common/scummsys.h"
#include "common/config-manager.h"
#include "common/error.h"
#include "common/system.h"
@@ -35,8 +41,6 @@
#include "backends/platform/ios7/ios7_common.h"
#endif
-#include <fluidsynth.h>
-
class MidiDriver_FluidSynth : public MidiDriver_Emulated {
private:
MidiChannel_MPU401 _midiChannels[16];

47
srcpkgs/residualvm/template
View file

@ -1,47 +0,0 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
revision=5
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
hostmakedepends="pkg-config"
makedepends="SDL2-devel libvorbis-devel libmad-devel libjpeg-turbo-devel
libpng-devel libtheora-devel zlib-devel libmpeg2-devel freetype-devel
glew-devel libflac-devel fluidsynth-devel faad2-devel $(vopt_if sndio sndio-devel)"
short_desc="Cross-platform 3D game interpreter"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause, ISC, MIT, Zlib"
homepage="https://www.residualvm.org/"
distfiles="https://www.residualvm.org/downloads/release/${version}/residualvm-${version}-sources.tar.bz2"
checksum=f50c83bbc55a8121eefc279e83982b6ec590e608e145b7f750006619dd0bf9e9
build_options="sndio"
build_options_default="sndio"
if [ -n "$CROSS_BUILD" ]; then
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
pre_configure() {
# - sdl-config wrapper already sets --prefix
# - freetype-config wrapper already sets --prefix
vsed -e "s;_ranlib=ranlib;_ranlib=${XBPS_CROSS_TRIPLET}-ranlib;" \
-e "s;_strip=strip;_strip=${XBPS_CROSS_TRIPLET}-strip;" \
-e "s;_ar=\"ar cru\";_ar=\"${XBPS_CROSS_TRIPLET}-ar cru\";" \
-e "s;_as=\"as\";_as=\"${XBPS_CROSS_TRIPLET}-as\";" \
-e 's;--prefix="$_sdlpath";;' \
-e 's;--prefix="$_freetypepath";;' \
-e "s;^_host_cpu=\"\";_host_cpu=\"${XBPS_TARGET_MACHINE}\";" \
-e 's;^_host_os="";_host_os="linux";' \
-i configure
}
fi
post_install() {
# move licenses to the right place
vmkdir usr/share/licenses/residualvm
mv ${DESTDIR}/usr/share/doc/residualvm/COPYING* ${DESTDIR}/usr/share/licenses/residualvm/
vlicense COPYING.BSD
vlicense COPYING.ISC
vlicense COPYING.MIT
}

2
srcpkgs/residualvm/update
View file

@ -1,2 +0,0 @@
site="http://www.residualvm.org/downloads/"
pattern="residualvm-\K[\d.]+(?=-sources)"

25
srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff
View file

@ -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

17
srcpkgs/scummvm/template
View file

@ -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 <me@johnnynator.dev>"
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*);;
@ -29,3 +28,9 @@ fi
do_check() {
make test
}
residualvm_package() {
build_style=meta
short_desc+=" (transitional dummy package)"
depends="${sourcepkg}>=${version}_${revision}"
}