From: clyhtsuriva <clyhtsuriva@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] rocksndiamonds: update to 4.3.0.1
Date: Sun, 21 Nov 2021 19:01:43 +0100 [thread overview]
Message-ID: <20211121180143.NVk2TGtbyIhKD1WkjwniSkqCHriWvrL3um1WprWcoqM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34169@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]
There is an updated pull request by clyhtsuriva against master on the void-packages repository
https://github.com/clyhtsuriva/void-packages rocksndiamonds-update
https://github.com/void-linux/void-packages/pull/34169
rocksndiamonds: update to 4.3.0.1
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, x86_64-glibc
- I built this PR locally for these architectures :
- aarch64-musl
- armv7l
- armv6l-musl
#### Note
I modified the build flags as the Makefile now only use BASE_PATH replacing both XX_GAME_DIR.
A patch file from https://github.com/void-linux/void-packages/pull/34169.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rocksndiamonds-update-34169.patch --]
[-- Type: text/x-diff, Size: 1535 bytes --]
From 0f4509ecb79c4d909cc5c9a25d1c4f791446bd71 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Sat, 20 Nov 2021 16:18:46 +0100
Subject: [PATCH] rocksndiamonds: update to 4.3.0.1
---
srcpkgs/rocksndiamonds/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 1985dee75923..b2301018dc39 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
# Template file for 'rocksndiamonds'
pkgname=rocksndiamonds
-version=4.2.3.1
+version=4.3.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -10,14 +10,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.artsoft.org/rocksndiamonds"
distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=58c1a63c147b7e6a2294d461cb65e6162e8493ec144a4d7b405544f48c432dca
+checksum=997f6cddb2fc48aed6e6b524b150974410f43956b420d37ebc098f40be92807c
replaces="rocksndiamonds-data>=0"
do_build() {
vsed -i Makefile -e "s;^\(MAKE_CMD = \$(MAKE)\);& ${makejobs};"
CFLAGS+=" -DTARGET_SDL2"
- CFLAGS+=" -DRO_GAME_DIR='\"/usr/share/${pkgname}\"'"
- CFLAGS+=" -DRW_GAME_DIR='\"/var/lib/${pkgname}\"'"
+ CFLAGS+=" -DBASE_PATH='\"/usr/share/${pkgname}\"'"
CFLAGS+=" $(sdl2-config --cflags)"
LDFLAGS+=" $(sdl2-config --libs) -lSDL2_image -lSDL2_mixer -lSDL2_net -lm -lz"
make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
next prev parent reply other threads:[~2021-11-21 18:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-20 15:43 [PR PATCH] " clyhtsuriva
2021-11-20 23:31 ` [PR PATCH] [Updated] " clyhtsuriva
2021-11-21 17:50 ` ericonr
2021-11-21 18:01 ` clyhtsuriva [this message]
2021-11-21 18:02 ` clyhtsuriva
2021-11-21 18:26 ` ericonr
2021-11-21 18:35 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211121180143.NVk2TGtbyIhKD1WkjwniSkqCHriWvrL3um1WprWcoqM@z \
--to=clyhtsuriva@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).