From: Aicaya <Aicaya@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt
Date: Mon, 04 Sep 2023 20:36:21 +0200 [thread overview]
Message-ID: <20230904183621.cnlpHPXDEokKLgzKFcjovptusL-VcGT-S8Kf-FnoTRM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45878@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
There is an updated pull request by Aicaya against master on the void-packages repository
https://github.com/Aicaya/void-packages opentyrian
https://github.com/void-linux/void-packages/pull/45878
opentyrian: update to 2.1.20221123, adopt
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (cross)
- armv6l (cross)
- aarch64 (cross)
A patch file from https://github.com/void-linux/void-packages/pull/45878.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-opentyrian-45878.patch --]
[-- Type: text/x-diff, Size: 2973 bytes --]
From 1192f1c9f2a210d35edbbb27721228d764f978a0 Mon Sep 17 00:00:00 2001
From: Aicaya Maro <aicaya@posteo.net>
Date: Sat, 2 Sep 2023 00:02:10 -0400
Subject: [PATCH] opentyrian: update to 2.1.20221123, adopt
---
srcpkgs/opentyrian/template | 58 ++++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a24..170ae7a56b6f3 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,40 +1,46 @@
# Template file for 'opentyrian'
pkgname=opentyrian
-version=2.1.20130907
-revision=3
-_dataver=21
+version=2.1.20221123
+revision=1
create_wrksrc=yes
-build_wrksrc=$pkgname-$version
+build_wrksrc="$pkgname-$version"
build_style=gnu-makefile
hostmakedepends="pkg-config unzip"
-makedepends="SDL_net-devel"
+makedepends="SDL2-devel SDL2_net-devel"
short_desc="OSS port of the DOS shoot-em-up Tyrian"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Aicaya Maro <aicaya@posteo.net>"
license="GPL-2.0-or-later"
homepage="https://github.com/opentyrian/opentyrian"
-distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
- http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz
+ http://camanis.net/tyrian/tyrian21.zip"
+checksum="e0e8a8b0d61de10a3a65789ace9ea8e8c5d8dc67f3e423d2c852d64da38aeeb9
7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
replaces="opentyrian-data>=0"
-CFLAGS="-Wno-error -fcommon"
+post_install() {
+ local _dir="${wrksrc}/tyrian21"
-pre_build() {
- vsed -i Makefile -e "s;-g0;$CFLAGS;"
-}
-do_install() {
- vbin ${pkgname}
- vman linux/man/${pkgname}.6
- vinstall linux/${pkgname}.desktop 644 usr/share/applications
- vinstall linux/icons/tyrian-128.png 644 usr/share/pixmaps ${pkgname}.png
- vmkdir usr/share/${sourcepkg}/data
- vcopy "${wrksrc}/tyrian${_dataver}/*" usr/share/${sourcepkg}/data
- cat <<EOT > manual.txt
-******** This is the original manual of the DOS game. The install
-instructions are obsolete, while the story and gameplay instructions
-starting in section "V) THE STORY" may still be useful. ********
-EOT
- sed 's/\r//' ${wrksrc}/tyrian${_dataver}/manual.doc >> manual.txt
+ # data files
+ vmkdir usr/share/games/tyrian
+ vcopy "${_dir}/*.dat
+ ${_dir}/*.lvl
+ ${_dir}/*.shp
+ ${_dir}/*.snd
+ ${_dir}/demo.*
+ ${_dir}/music.mus
+ ${_dir}/tyrend.anm
+ ${_dir}/tshp2.pcx
+ ${_dir}/tyrian.cdt
+ ${_dir}/tyrian.hdt
+ ${_dir}/tyrian.pic" usr/share/games/tyrian
+
+ # manual
+ cat <<- EOF > manual.txt
+ ******** This is the original manual of the DOS game. The install
+ instructions are obsolete, while the story and gameplay instructions
+ starting in section "V) THE STORY" may still be useful. ********
+
+ EOF
+ tr -d '\r' < "${_dir}/manual.doc" >> manual.txt
vdoc manual.txt
}
next prev parent reply other threads:[~2023-09-04 18:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-02 4:26 [PR PATCH] " Aicaya
2023-09-03 7:14 ` [PR PATCH] [Updated] " Aicaya
2023-09-03 17:17 ` Aicaya
2023-09-04 4:45 ` Aicaya
2023-09-04 5:00 ` Aicaya
2023-09-04 18:36 ` Aicaya [this message]
2023-09-04 18:50 ` Aicaya
2023-12-05 1:47 ` github-actions
2023-12-05 13:01 ` zen0bit
2024-03-06 1:44 ` github-actions
2024-03-06 5:58 ` zen0bit
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=20230904183621.cnlpHPXDEokKLgzKFcjovptusL-VcGT-S8Kf-FnoTRM@z \
--to=aicaya@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).