Re: [PR PATCH] [Updated] scummvm: update to 2.5.0.

[Johnnynator <Johnnynator@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages scummvm
https://github.com/void-linux/void-packages/pull/33336

scummvm: update to 2.5.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64


A patch file from https://github.com/void-linux/void-packages/pull/33336.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scummvm-33336.patch --]
[-- Type: text/x-diff, Size: 7172 bytes --]

From bee0284d14a39601a927ce2a769025f0f12485ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Oct 2021 10:57:20 +0200
Subject: [PATCH] scummvm: update to 2.5.0.

scummvm now includes residualvm
---
 srcpkgs/residualvm                            |  1 +
 .../residualvm/patches/fluidsynth-2.1.patch   | 29 ------------
 srcpkgs/residualvm/template                   | 47 -------------------
 srcpkgs/residualvm/update                     |  2 -
 srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff | 25 ----------
 srcpkgs/scummvm/template                      | 17 ++++---
 6 files changed, 12 insertions(+), 109 deletions(-)
 create mode 120000 srcpkgs/residualvm
 delete mode 100644 srcpkgs/residualvm/patches/fluidsynth-2.1.patch
 delete mode 100644 srcpkgs/residualvm/template
 delete mode 100644 srcpkgs/residualvm/update
 delete mode 100644 srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff

diff --git a/srcpkgs/residualvm b/srcpkgs/residualvm
new file mode 120000
index 000000000000..f36c75d23fd7
--- /dev/null
+++ b/srcpkgs/residualvm
@@ -0,0 +1 @@
+scummvm
\ No newline at end of file
diff --git a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch
deleted file mode 100644
index 4302d8cfac07..000000000000
--- a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch
+++ /dev/null
@@ -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];
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
deleted file mode 100644
index b0abb4052a9c..000000000000
--- a/srcpkgs/residualvm/template
+++ /dev/null
@@ -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
-}
diff --git a/srcpkgs/residualvm/update b/srcpkgs/residualvm/update
deleted file mode 100644
index 6c45ed9186c0..000000000000
--- a/srcpkgs/residualvm/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.residualvm.org/downloads/"
-pattern="residualvm-\K[\d.]+(?=-sources)"
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..e3ff00792958 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 <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}"
+}