[PR PATCH] devilutionX: update to 1.4.1.

[PR PATCH] devilutionX: update to 1.4.1.

[chloris-pale-green]

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

There is a new pull request by chloris-pale-green against master on the void-packages repository

https://github.com/chloris-pale-green/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/39184

devilutionX: update to 1.4.1.
Updated the package since the packaged version was released more than a year ago. For the most recent release, the template had to be changed for the build to succeed. See notes below.

**Cross builds seem to fail.** See notes below. Help is welcome.

#### 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)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (cross, **failed**)
  - armv6l (cross, **failed**),
  - x86_64-musl (masterdir)

#### Template changes
- Add devel dependencies so that more libs from the repos get dynamically linked instead of built and linked statically.
- Add host dependencies needed for the build process by trial and error.
- Upstream uses `smpq` to create a MPQ archive with game assets. Manually use `mpqtool` from Void repos. If the assets are not in a MPQ archive, the game expects them in something like `/usr/bin/assets`, which is not acceptable.
- Install process did nothing, even when manually calling `cmake --install`. The installation is not complicated so I've created an alternative install script.

#### Failing cross builds
Both `aarch64` and `armv6l` crossbuilds fail with the same error:
```
=> devilutionX-1.4.1_1: running do_build ...
ninja: error: '/usr/lib64/libSDL2main.a', needed by 'devilutionx', missing and no known rule to make it
```

Additionally, when I've tried to move `devel` deps to `hostmakedepends`, the build failed because the binary could not be stripped. I suspect that the build process does not cross-compile, but builds for the host arch instead (looking for libraries in `/usr/lib64` on `armv6l` is suspicious enough). Perhaps some additional arguments for Cmake are required.

A patch file from https://github.com/void-linux/void-packages/pull/39184.patch is attached

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

From dc5567e40a68fd13829b23674a4fc4aeb5886aa2 Mon Sep 17 00:00:00 2001
From: Chloris <chloris@freedommail.ch>
Date: Mon, 5 Sep 2022 09:07:01 +0200
Subject: [PATCH] devilutionX: update to 1.4.1.

---
 srcpkgs/devilutionX/template | 39 ++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..6bf190178769 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,44 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF"
+hostmakedepends="gettext git mpqtool pkgconf"
+makedepends="bzip2-devel fmt-devel libsodium-devel SDL2-devel SDL2_image-devel SDL2_mixer-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
 
-post_install() {
-	vlicense LICENSE
+post_build() {
+	# Create devilutionx.mpq asset archive
+	# (smpq, required by the build script, is not available in Void repos
+	# so an alternative program mpqtool is used to create the MPQ archive)
+	mpqtool new 'build/assets' 'build/devilutionx.mpq'
+}
+
+do_install() {
+	vbin 'build/devilutionx'
+	# Install assets to the directory that is recognized by the binary
+	vinstall 'build/devilutionx.mpq' 644 'usr/share/diasurgical/devilutionx'
+
+	vdoc 'README.md'
+	vlicense 'LICENSE'
+
+	cd 'Packaging'
+	# Install desktop entries
+	vinstall 'nix/devilutionx.desktop' 644 'usr/share/applications'
+	vinstall 'nix/devilutionx-hellfire.desktop' 644 'usr/share/applications'
+	# Install icons
+	vinstall 'resources/icon.png' 644 \
+		'usr/share/icons/hicolor/512x512/apps' 'devilutionx.png'
+	vinstall 'resources/hellfire.png' 644 \
+		'usr/share/icons/hicolor/512x512/apps' 'devilutionx-hellfire.png'
+	vinstall 'resources/icon_32.png' 644 \
+		'usr/share/icons/hicolor/32x32/apps' 'devilutionx.png'
+	vinstall 'resources/hellfire_32.png' 644 \
+		'usr/share/icons/hicolor/32x32/apps' 'devilutionx-hellfire.png'
 }

Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1.

[chloris-pale-green]

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

There is an updated pull request by chloris-pale-green against master on the void-packages repository

https://github.com/chloris-pale-green/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/39184

devilutionX: update to 1.4.1.
Updated the package since the packaged version was released more than a year ago. For the most recent release, the template had to be changed for the build to succeed. See notes below.

**Cross builds seem to fail.** See notes below. Help is welcome.

#### 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)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (cross, **failed**)
  - armv6l (cross, **failed**),
  - x86_64-musl (masterdir)

#### Template changes
- Add devel dependencies so that more libs from the repos get dynamically linked instead of built and linked statically.
- Add host dependencies needed for the build process by trial and error.
- Upstream uses `smpq` to create a MPQ archive with game assets. Manually use `mpqtool` from Void repos. If the assets are not in a MPQ archive, the game expects them in something like `/usr/bin/assets`, which is not acceptable.
- Install process did nothing, even when manually calling `cmake --install`. The installation is not complicated so I've created an alternative install script.

#### Failing cross builds
Both `aarch64` and `armv6l` crossbuilds fail with the same error:
```
=> devilutionX-1.4.1_1: running do_build ...
ninja: error: '/usr/lib64/libSDL2main.a', needed by 'devilutionx', missing and no known rule to make it
```

Additionally, when I've tried to move `devel` deps to `hostmakedepends`, the build failed because the binary could not be stripped. I suspect that the build process does not cross-compile, but builds for the host arch instead (looking for libraries in `/usr/lib64` on `armv6l` is suspicious enough). Perhaps some additional arguments for Cmake are required.

A patch file from https://github.com/void-linux/void-packages/pull/39184.patch is attached

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

From bd34d6756f84fd570dcbc0c84beb85f663ac0dae Mon Sep 17 00:00:00 2001
From: Chloris <chloris@freedommail.ch>
Date: Mon, 5 Sep 2022 09:07:01 +0200
Subject: [PATCH] devilutionX: update to 1.4.1.

---
 srcpkgs/devilutionX/template | 39 ++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..6bf190178769 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,44 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF"
+hostmakedepends="gettext git mpqtool pkgconf"
+makedepends="bzip2-devel fmt-devel libsodium-devel SDL2-devel SDL2_image-devel SDL2_mixer-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
 
-post_install() {
-	vlicense LICENSE
+post_build() {
+	# Create devilutionx.mpq asset archive
+	# (smpq, required by the build script, is not available in Void repos
+	# so an alternative program mpqtool is used to create the MPQ archive)
+	mpqtool new 'build/assets' 'build/devilutionx.mpq'
+}
+
+do_install() {
+	vbin 'build/devilutionx'
+	# Install assets to the directory that is recognized by the binary
+	vinstall 'build/devilutionx.mpq' 644 'usr/share/diasurgical/devilutionx'
+
+	vdoc 'README.md'
+	vlicense 'LICENSE'
+
+	cd 'Packaging'
+	# Install desktop entries
+	vinstall 'nix/devilutionx.desktop' 644 'usr/share/applications'
+	vinstall 'nix/devilutionx-hellfire.desktop' 644 'usr/share/applications'
+	# Install icons
+	vinstall 'resources/icon.png' 644 \
+		'usr/share/icons/hicolor/512x512/apps' 'devilutionx.png'
+	vinstall 'resources/hellfire.png' 644 \
+		'usr/share/icons/hicolor/512x512/apps' 'devilutionx-hellfire.png'
+	vinstall 'resources/icon_32.png' 644 \
+		'usr/share/icons/hicolor/32x32/apps' 'devilutionx.png'
+	vinstall 'resources/hellfire_32.png' 644 \
+		'usr/share/icons/hicolor/32x32/apps' 'devilutionx-hellfire.png'
 }

Re: devilutionX: update to 1.4.1.

[chloris-pale-green]

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

New comment by chloris-pale-green on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1242017867

Comment:
On ARM architectures there are many Cmake errors for different targets like this:
```
 CMake Error in build/_deps/sdl_audiolib-src/CMakeLists.txt:
  Imported target "SDL2::SDL2" includes non-existent path

    "/usr/include/SDL2"
```

If anyone has any idea why the libs seem to be missing, let me know. As far as I know, `SDL2-devel` is a dependency and it installs stuff into `/usr/include/SDL2`.

Re: devilutionX: update to 1.4.1.

[tranzystorek-io]

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

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1242641121

Comment:
Seems there's a problem with building SDL_audiolib from the fetched source, we could try packaging it ourselves

Re: devilutionX: update to 1.4.1.

[tranzystorek-io]

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

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1242641121

Comment:
Seems there's a problem with building SDL_audiolib from the fetched source, we could try packaging it ourselves

...or not, it's not versioned in any way :/

Re: devilutionX: update to 1.4.1.

[chloris-pale-green]

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

New comment by chloris-pale-green on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1242718047

Comment:
> Seems there's a problem with building SDL_audiolib from the fetched source, we could try packaging it ourselves
> 
> ...or not, it's not versioned in any way :/

It really does not seem to be versioned ... it's a bit like someone made a quick solution to their problem. I've also noticed that there is some overlap between contributors of devilutionX and SDL_audiolib. It's a good question if the package would be useful for anything else besides devilutionX.

However, I don't think it is a SDL_audiolib-specific issue that we're facing here. It seems to me that it simply doesn't find SDL libraries. They are detected as dynamic system libraries, but not found when things should get compiled.

Re: devilutionX: update to 1.4.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/39184#issuecomment-1344975478

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: devilutionX: update to 1.4.1.

[bugcrazy]

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1362990028

Comment:
M y PR is funcional for all architectures: https://github.com/void-linux/void-packages/pull/34039

Re: devilutionX: update to 1.4.1.

[bugcrazy]

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1362990028

Comment:
My PR is funcional for all architectures: https://github.com/void-linux/void-packages/pull/34039

Re: devilutionX: update to 1.4.1.

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1379332899

Comment:
@chloris-pale-green, I could make it build wth aarch64 on https://github.com/kruceter/void-packages/pull/2.

My work also includes your changes for which you have my gratitude.

I hope it will be useful to you.

Re: devilutionX: update to 1.4.1.

[chloris-pale-green]

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

New comment by chloris-pale-green on void-packages repository

https://github.com/void-linux/void-packages/pull/39184#issuecomment-1379932172

Comment:
Thank you, @kruceter. You've displayed some templating skills I'll never acquire in my life. 😁

Actually, I'm very grateful to you to make use of my incomplete work. So nice it didn't go to waste. 🙂

I'm closing this pull request. Further development should go in kruceter#2.

Re: [PR PATCH] [Closed]: devilutionX: update to 1.4.1.

[chloris-pale-green]

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

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

devilutionX: update to 1.4.1.
https://github.com/void-linux/void-packages/pull/39184

Description:
Updated the package since the packaged version was released more than a year ago. For the most recent release, the template had to be changed for the build to succeed. See notes below.

**Cross builds seem to fail.** See notes below. Help is welcome.

#### 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)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (cross, **failed**)
  - armv6l (cross, **failed**),
  - x86_64-musl (masterdir)

#### Template changes
- Add devel dependencies so that more libs from the repos get dynamically linked instead of built and linked statically.
- Add host dependencies needed for the build process by trial and error.
- Upstream uses `smpq` to create a MPQ archive with game assets. Manually use `mpqtool` from Void repos. If the assets are not in a MPQ archive, the game expects them in something like `/usr/bin/assets`, which is not acceptable.
- Install process did nothing, even when manually calling `cmake --install`. The installation is not complicated so I've created an alternative install script.

#### Failing cross builds
Both `aarch64` and `armv6l` crossbuilds fail with the same error:
```
=> devilutionX-1.4.1_1: running do_build ...
ninja: error: '/usr/lib64/libSDL2main.a', needed by 'devilutionx', missing and no known rule to make it
```

Additionally, when I've tried to move `devel` deps to `hostmakedepends`, the build failed because the binary could not be stripped. I suspect that the build process does not cross-compile, but builds for the host arch instead (looking for libraries in `/usr/lib64` on `armv6l` is suspicious enough). Perhaps some additional arguments for Cmake are required.

Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1.

[kruceter]

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

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

https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41658

devilutionX: update to 1.4.1.
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (cross)
  - armv6l-musl (cross)

#### About mpqtool

Apparently upstream needs some tool to pack assets into one file.

If such a tool is not used within CMake, `do_install()` will not install the binary, icons, etc to `$DESTDIR`.

Pull request #39184 had encountered this behaviour and placed needed files manually as a result.

Packaging `smpq` is a little too much, hence `mpqtool` is used with little patching to address all issues listed above.

A patch file from https://github.com/void-linux/void-packages/pull/41658.patch is attached

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

From 34b01b296609785efccee4c939ced7fb6798324f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 11 Jan 2023 07:37:38 +0300
Subject: [PATCH] devilutionX: update to 1.4.1.

* External (3rd party) dependencies normally are fetched with git,
  which is undesirable for packaging; hence they are fetched manually
  with xbps-src. "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" prevents
  cmake's FetchContent module from attempting to download or update any
  external dependencies.

* BINARY_RELEASE option is gone.

* CharisSILB is absent with TTF_FONT_PATH from the release tarball.
---
 srcpkgs/devilutionX/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..7e46cd95a68e 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,23 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.4.1
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+ -DDISABLE_ZERO_TIER=ON -DDEVILUTIONX_SYSTEM_GOOGLETEST=ON
+ -DDEVILUTIONX_SYSTEM_SDL2=ON -DDEVILUTIONX_SYSTEM_SDL_IMAGE=ON
+ -DDEVILUTIONX_SYSTEM_LIBFMT=ON -DDEVILUTIONX_SYSTEM_BZIP2=ON
+ -DDEVILUTIONX_SYSTEM_LIBSODIUM=ON"
+hostmakedepends="pkg-config gettext"
+makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
+ gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
-distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src-fully-vendored.tar.xz"
+checksum=80527c29cd1d369ce905be426b671350b400c9468b73ef8cfbe6a09a563aeac0
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1.

[kruceter]

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

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

https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41658

devilutionX: update to 1.4.1.
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (cross)
  - armv6l-musl (cross)

#### About mpqtool

Apparently upstream needs some tool to pack assets into one file.

If such a tool is not used within CMake, `do_install()` will not install the binary, icons, etc to `$DESTDIR`.

Pull request #39184 had encountered this behaviour and placed needed files manually as a result.

Packaging `smpq` is a little too much, hence `mpqtool` is used with little patching to address all issues listed above.

A patch file from https://github.com/void-linux/void-packages/pull/41658.patch is attached

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

From 0e8e54a24bcbc0b8c80e2294f4122ebcf419af13 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 11 Jan 2023 07:37:38 +0300
Subject: [PATCH] devilutionX: update to 1.4.1.

* External (3rd party) dependencies normally are fetched with git,
  which is undesirable for packaging; hence they are fetched manually
  with xbps-src. "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" prevents
  cmake's FetchContent module from attempting to download or update any
  external dependencies.

* BINARY_RELEASE option is gone.

* CharisSILB is absent with TTF_FONT_PATH from the release tarball.

* mpqtool is used for building devilutionx.mpq since smpq is not
  packaged.
---
 srcpkgs/devilutionX/patches/smpq.patch | 19 ++++++++++++
 srcpkgs/devilutionX/template           | 42 +++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/devilutionX/patches/smpq.patch

diff --git a/srcpkgs/devilutionX/patches/smpq.patch b/srcpkgs/devilutionX/patches/smpq.patch
new file mode 100644
index 000000000000..f14ddf7ea474
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/smpq.patch
@@ -0,0 +1,19 @@
+If smpq is not present (in our case not packaged for void at all),
+cmake --install will not install anything to DESTDIR.
+
+DEVILUTIONX_MPQ is used during the installation to DESTDIR, but
+undefined if smpq is not found (see CMake/Assets.cmake),
+thus it is also set in this patch.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -405,7 +405,8 @@
+   target_compile_definitions(libdevilutionx PRIVATE __UWP__=1)
+ endif()
+ 
+-if(CPACK AND (APPLE OR BUILD_ASSETS_MPQ OR SRC_DIST))
++if(CPACK)
++  set(DEVILUTIONX_MPQ "${CMAKE_CURRENT_BINARY_DIR}/devilutionx.mpq")
+   if(WIN32)
+     if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+       set(SDL2_WIN32_DLLS_DIR "${CMAKE_BINARY_DIR}")
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..5e5ee93d4baf 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,48 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.4.1
 revision=1
+# git revisions can be found in the 3rdParty directory of the
+# source code.
+_audiolib_gitrev=1a69135313c79817b38a3a99826d4ac28d627fdf
+_smackerdec_gitrev=2997ee0e41e91bb723003bc09234be553b190e38
+_libmpq_gitrev=0f10bd1600f406b13932bf5351ba713361262184
+_simpleini_gitrev=56499b5af5d2195c6acfc58c4630b70e0c9c4c21
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+ -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config mpqtool gettext"
+makedepends="SDL2-devel SDL2_image-devel libpng-devel bzip2-devel
+ libsodium-devel gtest-devel fmt-devel zlib-devel asio"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
-distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
+distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_audiolib_gitrev}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_smackerdec_gitrev}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_gitrev}.tar.gz
+ https://github.com/brofield/simpleini/archive/${_simpleini_gitrev}.tar.gz"
+checksum="54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+ 8e013245bf8e676d4e2c61661d7cee6cb9de74f97a475c9e6b35a25d5e7a7715
+ 40c0dc21943de22e153d56a7992c621a42a0c56c7cd833f8b84f90e48da753ea
+ ee173f5edb20f162482658cbc9d4bb84b640f651041d686c0ad7b2af12baf2a1
+ dbdb50a33d3edf791fc2622309d9c3d701a2fb7e7e2b403d3fa504e04f0ade0e"
+
+post_extract() {
+	mkdir -p build/_deps
+	mv ${pkgname}-${version}/* .
+	mv SDL_audiolib-${_audiolib_gitrev} build/_deps/sdl_audiolib-src
+	mv libsmackerdec-${_smackerdec_gitrev} build/_deps/libsmackerdec-src
+	mv libmpq-${_libmpq_gitrev} build/_deps/libmpq-src
+	mv simpleini-${_simpleini_gitrev} build/_deps/simpleini-src
+}
+
+post_build() {
+	# use mpqtool instead of unpackaged smpq
+	mpqtool new build/assets build/devilutionx.mpq
+}
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1.

[kruceter]

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

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

https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41658

devilutionX: update to 1.4.1.
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (cross)
  - armv6l-musl (cross)

#### About mpqtool

Apparently upstream needs some tool to pack assets into one file.

If such a tool is not used within CMake, `do_install()` will not install the binary, icons, etc to `$DESTDIR`.

Pull request #39184 had encountered this behaviour and placed needed files manually as a result.

Packaging `smpq` is a little too much, hence `mpqtool` is used with little patching to address all issues listed above.

A patch file from https://github.com/void-linux/void-packages/pull/41658.patch is attached

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

From a68f59bcc89d6a0205b72d80d275be6762638778 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 11 Jan 2023 07:37:38 +0300
Subject: [PATCH] devilutionX: update to 1.4.1.

* External (3rd party) dependencies normally are fetched with git,
  which is undesirable for packaging; hence they are fetched manually
  with xbps-src. "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" prevents
  cmake's FetchContent module from attempting to download or update any
  external dependencies.

* BINARY_RELEASE option is gone.

* CharisSILB is absent with TTF_FONT_PATH from the release tarball.

* mpqtool is used for building devilutionx.mpq since smpq is not
  packaged.
---
 srcpkgs/devilutionX/patches/smpq.patch | 19 ++++++++++++
 srcpkgs/devilutionX/template           | 41 ++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/devilutionX/patches/smpq.patch

diff --git a/srcpkgs/devilutionX/patches/smpq.patch b/srcpkgs/devilutionX/patches/smpq.patch
new file mode 100644
index 000000000000..f14ddf7ea474
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/smpq.patch
@@ -0,0 +1,19 @@
+If smpq is not present (in our case not packaged for void at all),
+cmake --install will not install anything to DESTDIR.
+
+DEVILUTIONX_MPQ is used during the installation to DESTDIR, but
+undefined if smpq is not found (see CMake/Assets.cmake),
+thus it is also set in this patch.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -405,7 +405,8 @@
+   target_compile_definitions(libdevilutionx PRIVATE __UWP__=1)
+ endif()
+ 
+-if(CPACK AND (APPLE OR BUILD_ASSETS_MPQ OR SRC_DIST))
++if(CPACK)
++  set(DEVILUTIONX_MPQ "${CMAKE_CURRENT_BINARY_DIR}/devilutionx.mpq")
+   if(WIN32)
+     if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+       set(SDL2_WIN32_DLLS_DIR "${CMAKE_BINARY_DIR}")
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..96c5e2bddea0 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,47 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.4.1
 revision=1
+# git revisions can be found in the 3rdParty directory of the
+# source code.
+_audiolib_gitrev=1a69135313c79817b38a3a99826d4ac28d627fdf
+_smackerdec_gitrev=2997ee0e41e91bb723003bc09234be553b190e38
+_libmpq_gitrev=0f10bd1600f406b13932bf5351ba713361262184
+_simpleini_gitrev=56499b5af5d2195c6acfc58c4630b70e0c9c4c21
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+ -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config mpqtool gettext"
+makedepends="SDL2-devel SDL2_image-devel libpng-devel bzip2-devel
+ libsodium-devel gtest-devel fmt-devel zlib-devel asio"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
-distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_audiolib_gitrev}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_smackerdec_gitrev}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_gitrev}.tar.gz
+ https://github.com/brofield/simpleini/archive/${_simpleini_gitrev}.tar.gz"
+checksum="54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+ 8e013245bf8e676d4e2c61661d7cee6cb9de74f97a475c9e6b35a25d5e7a7715
+ 40c0dc21943de22e153d56a7992c621a42a0c56c7cd833f8b84f90e48da753ea
+ ee173f5edb20f162482658cbc9d4bb84b640f651041d686c0ad7b2af12baf2a1
+ dbdb50a33d3edf791fc2622309d9c3d701a2fb7e7e2b403d3fa504e04f0ade0e"
+
+post_extract() {
+	mkdir -p build/_deps
+	mv ${pkgname}-${version}/* .
+	mv SDL_audiolib-${_audiolib_gitrev} build/_deps/sdl_audiolib-src
+	mv libsmackerdec-${_smackerdec_gitrev} build/_deps/libsmackerdec-src
+	mv libmpq-${_libmpq_gitrev} build/_deps/libmpq-src
+	mv simpleini-${_simpleini_gitrev} build/_deps/simpleini-src
+}
+
+post_build() {
+	# use mpqtool instead of unpackaged smpq
+	mpqtool new build/assets build/devilutionx.mpq
+}
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Updated] devilutionX: update to 1.4.1.

[kruceter]

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

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

https://github.com/kruceter/void-packages devilutionx
https://github.com/void-linux/void-packages/pull/41658

devilutionX: update to 1.4.1.
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (cross)
  - armv6l-musl (cross)

#### About mpqtool

Apparently upstream needs some tool to pack assets into one file.

If such a tool is not used within CMake, `do_install()` will not install the binary, icons, etc to `$DESTDIR`.

Pull request #39184 had encountered this behaviour and placed needed files manually as a result.

Packaging `smpq` is a little too much, hence `mpqtool` is used with little patching to make it work.

A patch file from https://github.com/void-linux/void-packages/pull/41658.patch is attached

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

From be311c89f6c2bed7efbd6b79c830c9eb9d7ec607 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 11 Jan 2023 07:37:38 +0300
Subject: [PATCH] devilutionX: update to 1.4.1.

* External (3rd party) dependencies normally are fetched with git,
  which is undesirable for packaging; hence they are fetched manually
  with xbps-src. "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" prevents
  cmake's FetchContent module from attempting to download or update any
  external dependencies.

* BINARY_RELEASE option is gone.

* CharisSILB is absent with TTF_FONT_PATH from the release tarball.

* mpqtool is used for building devilutionx.mpq since smpq is not
  packaged.
---
 srcpkgs/devilutionX/patches/smpq.patch | 19 ++++++++++++
 srcpkgs/devilutionX/template           | 41 ++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/devilutionX/patches/smpq.patch

diff --git a/srcpkgs/devilutionX/patches/smpq.patch b/srcpkgs/devilutionX/patches/smpq.patch
new file mode 100644
index 000000000000..f14ddf7ea474
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/smpq.patch
@@ -0,0 +1,19 @@
+If smpq is not present (in our case not packaged for void at all),
+cmake --install will not install anything to DESTDIR.
+
+DEVILUTIONX_MPQ is used during the installation to DESTDIR, but
+undefined if smpq is not found (see CMake/Assets.cmake),
+thus it is also set in this patch.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -405,7 +405,8 @@
+   target_compile_definitions(libdevilutionx PRIVATE __UWP__=1)
+ endif()
+ 
+-if(CPACK AND (APPLE OR BUILD_ASSETS_MPQ OR SRC_DIST))
++if(CPACK)
++  set(DEVILUTIONX_MPQ "${CMAKE_CURRENT_BINARY_DIR}/devilutionx.mpq")
+   if(WIN32)
+     if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+       set(SDL2_WIN32_DLLS_DIR "${CMAKE_BINARY_DIR}")
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..721da3240446 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,47 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.4.1
 revision=1
+# git revisions can be found in the 3rdParty directory of the
+# source code.
+_audiolib_gitrev=1a69135313c79817b38a3a99826d4ac28d627fdf
+_smackerdec_gitrev=2997ee0e41e91bb723003bc09234be553b190e38
+_libmpq_gitrev=0f10bd1600f406b13932bf5351ba713361262184
+_simpleini_gitrev=56499b5af5d2195c6acfc58c4630b70e0c9c4c21
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+ -DDISABLE_ZERO_TIER=ON"
+hostmakedepends="pkg-config mpqtool gettext"
+makedepends="SDL2-devel SDL2_image-devel libpng-devel bzip2-devel
+ libsodium-devel gtest-devel fmt-devel zlib-devel asio"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
-distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz
+ https://github.com/realnc/SDL_audiolib/archive/${_audiolib_gitrev}.tar.gz
+ https://github.com/diasurgical/libsmackerdec/archive/${_smackerdec_gitrev}.tar.gz
+ https://github.com/diasurgical/libmpq/archive/${_libmpq_gitrev}.tar.gz
+ https://github.com/brofield/simpleini/archive/${_simpleini_gitrev}.tar.gz"
+checksum="54b9fd496eba5b82d7e64891ab4de808f539c60b3b94bfa49639e0d9580fb7b8
+ 8e013245bf8e676d4e2c61661d7cee6cb9de74f97a475c9e6b35a25d5e7a7715
+ 40c0dc21943de22e153d56a7992c621a42a0c56c7cd833f8b84f90e48da753ea
+ ee173f5edb20f162482658cbc9d4bb84b640f651041d686c0ad7b2af12baf2a1
+ dbdb50a33d3edf791fc2622309d9c3d701a2fb7e7e2b403d3fa504e04f0ade0e"
+
+post_extract() {
+	mkdir -p build/_deps
+	mv ${pkgname}-${version}/* .
+	mv SDL_audiolib-${_audiolib_gitrev} build/_deps/sdl_audiolib-src
+	mv libsmackerdec-${_smackerdec_gitrev} build/_deps/libsmackerdec-src
+	mv libmpq-${_libmpq_gitrev} build/_deps/libmpq-src
+	mv simpleini-${_simpleini_gitrev} build/_deps/simpleini-src
+}
+
+post_build() {
+	# use mpqtool instead of unpackaged smpq
+	mpqtool new "build/assets" "build/devilutionx.mpq"
+}
 
 post_install() {
 	vlicense LICENSE