[PR PATCH] opentyrian: update to 2.1.20221123, adopt

[PR PATCH] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

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

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

From d4fe655a7a93ec556917205551a0338535b421ec 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 | 39 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a24..120d8bf2f157c 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,40 +1,23 @@
 # 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="https://github.com/opentyrian/opentyrian/archive/refs/tags/v${version}.tar.gz
+ http://camanis.net/tyrian/tyrian21.zip"
+checksum="e0e8a8b0d61de10a3a65789ace9ea8e8c5d8dc67f3e423d2c852d64da38aeeb9
  7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
 replaces="opentyrian-data>=0"
 
-CFLAGS="-Wno-error -fcommon"
-
-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
-	vdoc manual.txt
+post_install() {
+	vmkdir usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/* usr/share/games/tyrian
 }

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- 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: 2759 bytes --]

From ab4f67d0fb96b6041cde9b9f484bb0390a7686b3 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 | 44 +++++++++++++++----------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a24..edc6c2951095c 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,40 +1,32 @@
 # 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="https://github.com/opentyrian/opentyrian/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() {
+	vmkdir usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/* usr/share/games/tyrian
 
-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
+	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' < "${wrksrc}"/tyrian21/manual.doc >> manual.txt
 	vdoc manual.txt
 }

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- 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: 3398 bytes --]

From 35f3e06dd465b62240b22ef6d2499f051cea0975 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 | 56 ++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a24..ba71db960d534 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,40 +1,44 @@
 # 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="https://github.com/opentyrian/opentyrian/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() {
+	# data files
+	vmkdir usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/*.dat usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/*.lvl usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/*.shp usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/*.snd usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/demo.* usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/music.mus usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/tyrend.anm usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/tshp2.pcx usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/tyrian.cdt usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/tyrian.hdt usr/share/games/tyrian
+	vcopy "${wrksrc}"/tyrian21/tyrian.pic usr/share/games/tyrian
 
-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
+	# 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' < "${wrksrc}"/tyrian21/manual.doc >> manual.txt
 	vdoc manual.txt
 }

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- 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: 3011 bytes --]

From 86a3d458bae29a427357ea366fd10974b0c17ced 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 | 57 ++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a24..e5ae1edff5bb2 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,40 +1,45 @@
 # 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="https://github.com/opentyrian/opentyrian/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() {
+	# data files
+	local _dir="${wrksrc}/tyrian21"
+	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
 
-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
+	# 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' < "${wrksrc}"/tyrian21/manual.doc >> manual.txt
 	vdoc manual.txt
 }

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- 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: 3002 bytes --]

From c37523dab60b28b05d5f5ca6337b8251371bc579 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..2212d5b07940c 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="https://github.com/opentyrian/opentyrian/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
 }

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- 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
 }

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- 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: 2974 bytes --]

From fd06ca037677adbabe87259e5b98de64c6269579 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..2d080e94929af 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
+ https://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
 }

Re: opentyrian: update to 2.1.20221123, adopt

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-1839860408

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: opentyrian: update to 2.1.20221123, adopt

[zen0bit]

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

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-1840750042

Comment:
bump

Re: opentyrian: update to 2.1.20221123, adopt

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-1979929400

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: opentyrian: update to 2.1.20221123, adopt

[zen0bit]

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

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-1980140085

Comment:
bump

Re: opentyrian: update to 2.1.20221123, adopt

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-2148709074

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: opentyrian: update to 2.1.20221123, adopt

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-2150856676

Comment:
bump

Re: opentyrian: update to 2.1.20221123, adopt

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-2272558965

Comment:
rebase please

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- Attachment #1: Type: text/plain, Size: 643 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
  - 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: 2976 bytes --]

From aa1e256c348e65ac0b38e7ce8931de434779edd6 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 2f70a3b2a0a246..2d080e94929af2 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
+ https://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
 }

Re: opentyrian: update to 2.1.20221123, adopt

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-2274243903

Comment:
Done

Re: opentyrian: update to 2.1.20221123, adopt

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-2274243903

Comment:
Done. Will figure out why build fails now in a bit.

Re: opentyrian: update to 2.1.20221123, adopt

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-2274262283

Comment:
create_wrksrc probably isn't needed

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- Attachment #1: Type: text/plain, Size: 643 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
  - 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: 3254 bytes --]

From 74da4a1eeb2d8039f72ae414071c2443322db5bd 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 2f70a3b2a0a246..7b4c33a8563cfa 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
+ https://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 usr/share/games/tyrian
+	vcopy ${_dir}/*.lvl usr/share/games/tyrian
+	vcopy ${_dir}/*.shp usr/share/games/tyrian
+	vcopy ${_dir}/*.snd usr/share/games/tyrian
+	vcopy ${_dir}/demo.* usr/share/games/tyrian
+	vcopy ${_dir}/music.mus usr/share/games/tyrian
+	vcopy ${_dir}/tyrend.anm usr/share/games/tyrian
+	vcopy ${_dir}/tshp2.pcx usr/share/games/tyrian
+	vcopy ${_dir}/tyrian.cdt usr/share/games/tyrian
+	vcopy ${_dir}/tyrian.hdt usr/share/games/tyrian
+	vcopy ${_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
 }

Re: [PR PATCH] [Updated] opentyrian: update to 2.1.20221123, adopt

[Aicaya]

[-- Attachment #1: Type: text/plain, Size: 643 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
  - 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: 3254 bytes --]

From 9392dedf09179ab02d370fce29ac3950db62568a 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 | 59 ++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a246..bbd0475ab07ec5 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,40 +1,45 @@
 # Template file for 'opentyrian'
 pkgname=opentyrian
-version=2.1.20130907
-revision=3
-_dataver=21
-create_wrksrc=yes
-build_wrksrc=$pkgname-$version
+version=2.1.20221123
+revision=1
+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
+ https://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 usr/share/games/tyrian
+	vcopy ${_dir}/*.lvl usr/share/games/tyrian
+	vcopy ${_dir}/*.shp usr/share/games/tyrian
+	vcopy ${_dir}/*.snd usr/share/games/tyrian
+	vcopy ${_dir}/demo.* usr/share/games/tyrian
+	vcopy ${_dir}/music.mus usr/share/games/tyrian
+	vcopy ${_dir}/tyrend.anm usr/share/games/tyrian
+	vcopy ${_dir}/tshp2.pcx usr/share/games/tyrian
+	vcopy ${_dir}/tyrian.cdt usr/share/games/tyrian
+	vcopy ${_dir}/tyrian.hdt usr/share/games/tyrian
+	vcopy ${_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
 }

Re: opentyrian: update to 2.1.20221123, adopt

[Aicaya]

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

New comment by Aicaya on void-packages repository

https://github.com/void-linux/void-packages/pull/45878#issuecomment-2274287999

Comment:
Removed create_wrksrc and fixed build issues.

Re: [PR PATCH] [Merged]: opentyrian: update to 2.1.20221123, adopt

[classabbyamp]

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

There's a merged pull request on the void-packages repository

opentyrian: update to 2.1.20221123, adopt
https://github.com/void-linux/void-packages/pull/45878

Description:
#### 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
  - armv6l (cross)
  - aarch64 (cross)