[PR PATCH] New package: freedoom-0.12.1

[PR PATCH] New package: freedoom-0.12.1

[lilmike]

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

There is a new pull request by lilmike against master on the void-packages repository

https://github.com/lilmike/void-packages freedoom
https://github.com/void-linux/void-packages/pull/47100

New package: freedoom-0.12.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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
                                                                                                                                
<!-- 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/47100.patch is attached

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

From 1f7a900ba6e6a48ca0c0376fafcf49736ce59952 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 29 Oct 2022 22:49:54 -0700
Subject: [PATCH] New package: freedoom-0.12.1

---
 .../patches/fix-pillow-breakage.patch         | 28 +++++++++++++++++++
 srcpkgs/freedoom/template                     | 21 ++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/freedoom/patches/fix-pillow-breakage.patch
 create mode 100644 srcpkgs/freedoom/template

diff --git a/srcpkgs/freedoom/patches/fix-pillow-breakage.patch b/srcpkgs/freedoom/patches/fix-pillow-breakage.patch
new file mode 100644
index 0000000000000..0701c280a1d2b
--- /dev/null
+++ b/srcpkgs/freedoom/patches/fix-pillow-breakage.patch
@@ -0,0 +1,28 @@
+diff --git a/graphics/text/create_caption b/graphics/text/create_caption
+index 7ddbd8d6..22bc0507 100755
+--- a/graphics/text/create_caption
++++ b/graphics/text/create_caption
+@@ -18,8 +18,21 @@ background_image.load()
+ background_image = background_image.convert("RGBA")
+ image = Image.new("RGBA", background_image.size, (0, 0, 0, 0))
+ draw = ImageDraw.Draw(image)
+-txt1_size = draw.textsize(txt1, font=font)
+-txt2_size = draw.textsize(txt2, font=font)
++
++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only
++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize()
++# is supported. The solution is to default to the newer API, but fallback to
++# the older one when it is not available.
++try:
++    # This newer API returns a four item tuple. The "xy" kwarg is returned in
++    # the first two items, and last two items is the size needed, but with "xy"
++    # added, so passing "(0, 0)" returns the size needed.
++    txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:]
++    txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:]
++except:
++    # This older API simply returns the size needed.
++    txt1_size = draw.textsize(txt1, font=font)
++    txt2_size = draw.textsize(txt2, font=font)
+ 
+ draw.text(
+     (5, int(image.height - txt1_size[1] - 5)),
diff --git a/srcpkgs/freedoom/template b/srcpkgs/freedoom/template
new file mode 100644
index 0000000000000..14882c7dbcd26
--- /dev/null
+++ b/srcpkgs/freedoom/template
@@ -0,0 +1,21 @@
+# Template file for 'freedoom'
+pkgname=freedoom
+version=0.12.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="asciidoc deutex python3 python3-Pillow"
+short_desc="Free game based on the Doom engine"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
+license="BSD-3-Clause"
+homepage="https://freedoom.github.io/"
+distfiles="https://github.com/$pkgname/$pkgname/releases/download/v$version/$pkgname-$version.tar.xz"
+checksum=bad733695664c699fc7f02c833916c889b080fadc3b503c40f0aaba3bf637380
+
+pre_build() {
+	# CPP doesn't seem to be used for a c preprocessor in this makefile (?), so replacing the value in the makefile breaks the build.
+	make_build_args="CPP=${XBPS_BUILDDIR}/freedoom-${version}/scripts/simplecpp"
+}
+
+post_install() {
+	vlicense ${XBPS_BUILDDIR}/freedoom-${version}/COPYING.adoc
+}

Re: [PR REVIEW] New package: freedoom-0.12.1

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#discussion_r1396276572

Comment:
```suggestion
make_build_args="CPP='scripts/simplecpp'"
```
and put it after build_style

Re: [PR REVIEW] New package: freedoom-0.12.1

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#discussion_r1396277117

Comment:
don't use $pkgname in distfiles

Re: [PR REVIEW] New package: freedoom-0.12.1

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#discussion_r1396277725

Comment:
```suggestion
hostmakedepends="asciidoc deutex python3-Pillow"
```
python3 is redundant if python3-Pillow is there

Re: [PR REVIEW] New package: freedoom-0.12.1

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#discussion_r1396275086

Comment:
```suggestion
	vlicense COPYING.adoc
```
you're already in that dir (wrksrc)

Re: [PR PATCH] [Updated] New package: freedoom-0.12.1

[lilmike]

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

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

https://github.com/lilmike/void-packages freedoom
https://github.com/void-linux/void-packages/pull/47100

New package: freedoom-0.12.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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
                                                                                                                                
<!-- 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/47100.patch is attached

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

From ce33305bb8b14178d22f794c02f424c49ec78c31 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 29 Oct 2022 22:49:54 -0700
Subject: [PATCH] New package: freedoom-0.12.1

---
 .../patches/fix-pillow-breakage.patch         | 28 +++++++++++++++++++
 srcpkgs/freedoom/template                     | 17 +++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 srcpkgs/freedoom/patches/fix-pillow-breakage.patch
 create mode 100644 srcpkgs/freedoom/template

diff --git a/srcpkgs/freedoom/patches/fix-pillow-breakage.patch b/srcpkgs/freedoom/patches/fix-pillow-breakage.patch
new file mode 100644
index 0000000000000..0701c280a1d2b
--- /dev/null
+++ b/srcpkgs/freedoom/patches/fix-pillow-breakage.patch
@@ -0,0 +1,28 @@
+diff --git a/graphics/text/create_caption b/graphics/text/create_caption
+index 7ddbd8d6..22bc0507 100755
+--- a/graphics/text/create_caption
++++ b/graphics/text/create_caption
+@@ -18,8 +18,21 @@ background_image.load()
+ background_image = background_image.convert("RGBA")
+ image = Image.new("RGBA", background_image.size, (0, 0, 0, 0))
+ draw = ImageDraw.Draw(image)
+-txt1_size = draw.textsize(txt1, font=font)
+-txt2_size = draw.textsize(txt2, font=font)
++
++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only
++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize()
++# is supported. The solution is to default to the newer API, but fallback to
++# the older one when it is not available.
++try:
++    # This newer API returns a four item tuple. The "xy" kwarg is returned in
++    # the first two items, and last two items is the size needed, but with "xy"
++    # added, so passing "(0, 0)" returns the size needed.
++    txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:]
++    txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:]
++except:
++    # This older API simply returns the size needed.
++    txt1_size = draw.textsize(txt1, font=font)
++    txt2_size = draw.textsize(txt2, font=font)
+ 
+ draw.text(
+     (5, int(image.height - txt1_size[1] - 5)),
diff --git a/srcpkgs/freedoom/template b/srcpkgs/freedoom/template
new file mode 100644
index 0000000000000..740b27e23e2f8
--- /dev/null
+++ b/srcpkgs/freedoom/template
@@ -0,0 +1,17 @@
+# Template file for 'freedoom'
+pkgname=freedoom
+version=0.12.1
+revision=1
+build_style=gnu-makefile
+make_build_args="CPP=${XBPS_BUILDDIR}/freedoom-${version}/scripts/simplecpp" # Setting to scripts/simplecpp will fail when make changes to another directory
+hostmakedepends="asciidoc deutex python3-Pillow"
+short_desc="Free game based on the Doom engine"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
+license="BSD-3-Clause"
+homepage="https://freedoom.github.io/"
+distfiles="https://github.com/freedoom/freedoom/releases/download/v$version/freedoom-$version.tar.xz"
+checksum=bad733695664c699fc7f02c833916c889b080fadc3b503c40f0aaba3bf637380
+
+post_install() {
+	vlicense COPYING.adoc
+}

Re: [PR REVIEW] New package: freedoom-0.12.1

[lilmike]

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

New review comment by lilmike on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#discussion_r1396307774

Comment:
Using scripts/simplecpp breaks when make chdirs to another directory, no idea how the makefile normally works at all lol.

Re: [PR REVIEW] New package: freedoom-0.12.1

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#discussion_r1396318571

Comment:
```suggestion
make_use_env=yes
```

Re: [PR PATCH] [Updated] New package: freedoom-0.12.1

[lilmike]

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

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

https://github.com/lilmike/void-packages freedoom
https://github.com/void-linux/void-packages/pull/47100

New package: freedoom-0.12.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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
                                                                                                                                
<!-- 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/47100.patch is attached

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

From 95cd4cf4b80ccfb880e2a2f29fcbe550fe09b462 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 29 Oct 2022 22:49:54 -0700
Subject: [PATCH] New package: freedoom-0.12.1

---
 .../patches/fix-pillow-breakage.patch         | 28 +++++++++++++++++++
 srcpkgs/freedoom/template                     | 17 +++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 srcpkgs/freedoom/patches/fix-pillow-breakage.patch
 create mode 100644 srcpkgs/freedoom/template

diff --git a/srcpkgs/freedoom/patches/fix-pillow-breakage.patch b/srcpkgs/freedoom/patches/fix-pillow-breakage.patch
new file mode 100644
index 0000000000000..0701c280a1d2b
--- /dev/null
+++ b/srcpkgs/freedoom/patches/fix-pillow-breakage.patch
@@ -0,0 +1,28 @@
+diff --git a/graphics/text/create_caption b/graphics/text/create_caption
+index 7ddbd8d6..22bc0507 100755
+--- a/graphics/text/create_caption
++++ b/graphics/text/create_caption
+@@ -18,8 +18,21 @@ background_image.load()
+ background_image = background_image.convert("RGBA")
+ image = Image.new("RGBA", background_image.size, (0, 0, 0, 0))
+ draw = ImageDraw.Draw(image)
+-txt1_size = draw.textsize(txt1, font=font)
+-txt2_size = draw.textsize(txt2, font=font)
++
++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only
++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize()
++# is supported. The solution is to default to the newer API, but fallback to
++# the older one when it is not available.
++try:
++    # This newer API returns a four item tuple. The "xy" kwarg is returned in
++    # the first two items, and last two items is the size needed, but with "xy"
++    # added, so passing "(0, 0)" returns the size needed.
++    txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:]
++    txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:]
++except:
++    # This older API simply returns the size needed.
++    txt1_size = draw.textsize(txt1, font=font)
++    txt2_size = draw.textsize(txt2, font=font)
+ 
+ draw.text(
+     (5, int(image.height - txt1_size[1] - 5)),
diff --git a/srcpkgs/freedoom/template b/srcpkgs/freedoom/template
new file mode 100644
index 0000000000000..383ba6fd7d8b4
--- /dev/null
+++ b/srcpkgs/freedoom/template
@@ -0,0 +1,17 @@
+# Template file for 'freedoom'
+pkgname=freedoom
+version=0.12.1
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="asciidoc deutex python3-Pillow"
+short_desc="Free game based on the Doom engine"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
+license="BSD-3-Clause"
+homepage="https://freedoom.github.io/"
+distfiles="https://github.com/freedoom/freedoom/releases/download/v$version/freedoom-$version.tar.xz"
+checksum=bad733695664c699fc7f02c833916c889b080fadc3b503c40f0aaba3bf637380
+
+post_install() {
+	vlicense COPYING.adoc
+}

Re: New package: freedoom-0.12.1

[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/47100#issuecomment-1945232569

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: New package: freedoom-0.12.1

[lilmike]

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

New comment by lilmike on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#issuecomment-1946330427

Comment:
Bump: This is still relevant.

Re: [PR PATCH] [Updated] New package: freedoom-0.12.1

[lilmike]

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

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

https://github.com/lilmike/void-packages freedoom
https://github.com/void-linux/void-packages/pull/47100

New package: freedoom-0.12.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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
                                                                                                                                
<!-- 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/47100.patch is attached

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

From 9491a351be31280db11b86d2190eb39b615e62b8 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 29 Oct 2022 22:49:54 -0700
Subject: [PATCH] New package: freedoom-0.13.0

---
 srcpkgs/freedoom/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/freedoom/template

diff --git a/srcpkgs/freedoom/template b/srcpkgs/freedoom/template
new file mode 100644
index 0000000000000..e5c233e960154
--- /dev/null
+++ b/srcpkgs/freedoom/template
@@ -0,0 +1,17 @@
+# Template file for 'freedoom'
+pkgname=freedoom
+version=0.13.0
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="asciidoc deutex python3-Pillow"
+short_desc="Free game based on the Doom engine"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
+license="BSD-3-Clause"
+homepage="https://freedoom.github.io/"
+distfiles="https://github.com/freedoom/freedoom/archive/refs/tags/v${version}.tar.gz"
+checksum=860edb005bcf0b2acf29d10fd9130c91025301764a4d0d6dcffc503fdf8d2c77
+
+post_install() {
+	vlicense COPYING.adoc
+}

Re: New package: freedoom-0.12.1

[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/47100#issuecomment-2113785659

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: New package: freedoom-0.12.1

[lilmike]

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

New comment by lilmike on void-packages repository

https://github.com/void-linux/void-packages/pull/47100#issuecomment-2114251184

Comment:
This is also still relevant.

-Michael.