Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] scummvm: update to 2.5.0.
@ 2021-10-05 10:37 Johnnynator
  2021-10-05 16:25 ` newbluemoon
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Johnnynator @ 2021-10-05 10:37 UTC (permalink / raw)
  To: ml

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

There is a new 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: 2851 bytes --]

From 3174a3c53f502eb69c7ab885da8402514519c1b2 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.

---
 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 <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*);;

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-12  9:33 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 10:37 [PR PATCH] scummvm: update to 2.5.0 Johnnynator
2021-10-05 16:25 ` newbluemoon
2021-10-10 11:45 ` [PR PATCH] [Updated] " Johnnynator
2021-10-10 11:52 ` Johnnynator
2021-10-11 20:01 ` [PR REVIEW] " Chocimier
2021-10-12  9:18 ` [PR PATCH] [Updated] " Johnnynator
2021-10-12  9:33 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).