Re: [PR PATCH] [Updated] New package: eternity-4.02.00

[Antkibo <Antkibo@users.noreply.github.com>]

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

There is an updated pull request by Antkibo against master on the void-packages repository

https://github.com/Antkibo/void-packages master
https://github.com/void-linux/void-packages/pull/29438

New package: eternity-4.02.00
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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.)
- [ ] 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/29438.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29438.patch --]
[-- Type: text/x-diff, Size: 5592 bytes --]

From 2ef4a5edb4d817ec2eb464f51d7149c4e3457032 Mon Sep 17 00:00:00 2001
From: Antkibo <hxd.1996@gmail.com>
Date: Sat, 13 Mar 2021 13:40:35 -0400
Subject: [PATCH 1/4] New package: eternity-4.02.00

---
 srcpkgs/eternity/INSTALL.msg | 15 +++++++++++++++
 srcpkgs/eternity/template    | 27 +++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 srcpkgs/eternity/INSTALL.msg
 create mode 100644 srcpkgs/eternity/template

diff --git a/srcpkgs/eternity/INSTALL.msg b/srcpkgs/eternity/INSTALL.msg
new file mode 100644
index 000000000000..fdf4fd5938c5
--- /dev/null
+++ b/srcpkgs/eternity/INSTALL.msg
@@ -0,0 +1,15 @@
+Before loading WADs, go to:
+
+	/usr/share/eternity/base
+
+And check if the following directories exist:
+
+	* doom
+	* doom2
+	* hacx
+	* heretic
+	* plutonia
+	* shots
+	* tnt
+
+If they aren't, create the missing ones with mkdir.
diff --git a/srcpkgs/eternity/template b/srcpkgs/eternity/template
new file mode 100644
index 000000000000..f2d29d26dc4f
--- /dev/null
+++ b/srcpkgs/eternity/template
@@ -0,0 +1,27 @@
+# Template file for 'eternity'
+pkgname=eternity
+version=4.02.00
+revision=1
+#archs="i686 x86_64"
+#wrksrc=
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+build_style=cmake
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="cmake"
+makedepends="SDL2-devel SDL2_mixer-devel SDL2_net-devel zlib-devel"
+short_desc="Advanced Boom-compatible Doom engine with vanilla compatibility"
+maintainer="Antkibo <hxd.1996@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/team-eternity/eternity"
+distfiles="https://github.com/team-eternity/eternity/archive/${version}.tar.gz https://github.com/Wohlstand/libADLMIDI/archive/v1.5.0.1-1.tar.gz"
+checksum="bb9f69af38394dadd5b4d619b4ce8930728e1e61c70085379f53978be228c333
+ f19b18f35564f4db6f5d35d820655ea48e2cf8ffb193037fad74eecbabb35f07"
+
+post_extract() {
+	cp -r ${wrksrc}/libADLMIDI-1.5.0.1-1/* ${wrksrc}/${pkgname}-${version}/adlmidi
+}

From 042523b8ff5d88c6d9cb05815d46a400180865de Mon Sep 17 00:00:00 2001
From: Antkibo <hxd.1996@gmail.com>
Date: Sun, 25 Apr 2021 11:51:14 -0400
Subject: [PATCH 2/4] Remove default template comments

---
 srcpkgs/eternity/template | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/srcpkgs/eternity/template b/srcpkgs/eternity/template
index f2d29d26dc4f..b626ccebf660 100644
--- a/srcpkgs/eternity/template
+++ b/srcpkgs/eternity/template
@@ -1,17 +1,9 @@
-# Template file for 'eternity'
 pkgname=eternity
 version=4.02.00
 revision=1
-#archs="i686 x86_64"
-#wrksrc=
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=cmake
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="cmake"
 makedepends="SDL2-devel SDL2_mixer-devel SDL2_net-devel zlib-devel"
 short_desc="Advanced Boom-compatible Doom engine with vanilla compatibility"

From 3dcb5acf14475896016515b422919ae0c6430af9 Mon Sep 17 00:00:00 2001
From: Antkibo <hxd.1996@gmail.com>
Date: Sun, 25 Apr 2021 12:09:46 -0400
Subject: [PATCH 3/4] Add make_dirs and change post_extract

---
 srcpkgs/eternity/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eternity/template b/srcpkgs/eternity/template
index b626ccebf660..16f85cfa4dfa 100644
--- a/srcpkgs/eternity/template
+++ b/srcpkgs/eternity/template
@@ -3,6 +3,11 @@ version=4.02.00
 revision=1
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
+make_dirs="/usr/share/eternity/base/doom2 0755 root root
+/usr/share/eternity/base/hacx 0755 root root
+/usr/share/eternity/base/plutonia 0755 root root
+/usr/share/eternity/base/shots 0755 root root
+/usr/share/eternity/base/tnt 0755 root root"
 build_style=cmake
 hostmakedepends="cmake"
 makedepends="SDL2-devel SDL2_mixer-devel SDL2_net-devel zlib-devel"
@@ -10,10 +15,12 @@ short_desc="Advanced Boom-compatible Doom engine with vanilla compatibility"
 maintainer="Antkibo <hxd.1996@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/team-eternity/eternity"
-distfiles="https://github.com/team-eternity/eternity/archive/${version}.tar.gz https://github.com/Wohlstand/libADLMIDI/archive/v1.5.0.1-1.tar.gz"
+distfiles="https://github.com/team-eternity/eternity/archive/${version}.tar.gz 
+https://github.com/Wohlstand/libADLMIDI/archive/v1.5.0.1-1.tar.gz"
 checksum="bb9f69af38394dadd5b4d619b4ce8930728e1e61c70085379f53978be228c333
  f19b18f35564f4db6f5d35d820655ea48e2cf8ffb193037fad74eecbabb35f07"
 
 post_extract() {
-	cp -r ${wrksrc}/libADLMIDI-1.5.0.1-1/* ${wrksrc}/${pkgname}-${version}/adlmidi
+        rmdir ${wrksrc}/${pkgname}-${version}/adlmidi
+        mv ${wrksrc}/libADLMIDI-1.5.0.1-1 ${wrksrc}/${pkgname}-${version}
 }

From 94c50eb48cc359c6149ead079b5b7e2cc984e08d Mon Sep 17 00:00:00 2001
From: Antkibo <hxd.1996@gmail.com>
Date: Sun, 25 Apr 2021 12:10:23 -0400
Subject: [PATCH 4/4] Delete INSTALL.msg

---
 srcpkgs/eternity/INSTALL.msg | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/eternity/INSTALL.msg

diff --git a/srcpkgs/eternity/INSTALL.msg b/srcpkgs/eternity/INSTALL.msg
deleted file mode 100644
index fdf4fd5938c5..000000000000
--- a/srcpkgs/eternity/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-Before loading WADs, go to:
-
-	/usr/share/eternity/base
-
-And check if the following directories exist:
-
-	* doom
-	* doom2
-	* hacx
-	* heretic
-	* plutonia
-	* shots
-	* tnt
-
-If they aren't, create the missing ones with mkdir.