* [PR PATCH] scummvm: update to 2.7.1.
@ 2023-12-05 16:56 Johnnynator
2023-12-06 12:18 ` [PR PATCH] [Merged]: " Johnnynator
0 siblings, 1 reply; 2+ messages in thread
From: Johnnynator @ 2023-12-05 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 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/47601
scummvm: update to 2.7.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47601.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scummvm-47601.patch --]
[-- Type: text/x-diff, Size: 2265 bytes --]
From 28e0446779c3441eb5cd3b05d6b77beab615913f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Dec 2023 17:11:16 +0100
Subject: [PATCH] scummvm: update to 2.7.1.
---
srcpkgs/scummvm/patches/null.patch | 29 +++++++++++++++++++++++++++++
srcpkgs/scummvm/template | 6 +++---
2 files changed, 32 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/scummvm/patches/null.patch
diff --git a/srcpkgs/scummvm/patches/null.patch b/srcpkgs/scummvm/patches/null.patch
new file mode 100644
index 0000000000000..b9125ee002c52
--- /dev/null
+++ b/srcpkgs/scummvm/patches/null.patch
@@ -0,0 +1,29 @@
+--- a/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp 2023-07-14 23:43:45.000000000 +0200
++++ - 2023-12-05 17:21:11.466380253 +0100
+@@ -2714,7 +2714,7 @@
+ if (handle) {
+ handle->m_edge = NULL;
+ }
+- ptr->m_userData = dgUnsigned32(NULL);
++ ptr->m_userData = dgUnsigned32(0);
+
+ }
+
+@@ -2753,7 +2753,7 @@
+ if (handle) {
+ handle->m_edge = NULL;
+ }
+- ptr1->m_userData = dgUnsigned32(NULL);
++ ptr1->m_userData = dgUnsigned32(0);
+
+ }
+ }
+@@ -2780,7 +2780,7 @@
+ if (handle) {
+ handle->m_edge = NULL;
+ }
+- ptr1->m_twin->m_userData = dgUnsigned32(NULL);
++ ptr1->m_twin->m_userData = dgUnsigned32(0);
+
+ }
+ }
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 30745b37c455a..24de7a95ace78 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
# Template file for 'scummvm'
pkgname=scummvm
-version=2.6.1
-revision=2
+version=2.7.1
+revision=1
build_style=configure
configure_args="--prefix=/usr --enable-release-mode --enable-all-engines"
hostmakedepends="pkg-config nasm"
@@ -14,7 +14,7 @@ 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=8fafb9efabdd1bf8adfe39eeec3fc80b22de30ceddd1fadcde180e356cd317e9
+checksum=d6bbf62e33154759a609d59f3034d71652ecdb64ed5c800156718ab1f1d5d063
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*);;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: scummvm: update to 2.7.1.
2023-12-05 16:56 [PR PATCH] scummvm: update to 2.7.1 Johnnynator
@ 2023-12-06 12:18 ` Johnnynator
0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2023-12-06 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]
There's a merged pull request on the void-packages repository
scummvm: update to 2.7.1.
https://github.com/void-linux/void-packages/pull/47601
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-06 12:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-05 16:56 [PR PATCH] scummvm: update to 2.7.1 Johnnynator
2023-12-06 12:18 ` [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).