Re: [PR PATCH] [Updated] New package: TheForceEngine-1.09.530

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

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

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

https://github.com/kedodrill/void-packages TheForceEngine
https://github.com/void-linux/void-packages/pull/45745

New package: TheForceEngine-1.09.530
<!-- Uncomment relevant sections and delete options which are not applicable -->

https://github.com/luciusDXL/TheForceEngine

* Requires `rtmidi` to get bumped to `5.0.0`, but I went ahead and bumped it to `6.0.0`. The license changed, but I think most of the other changes are features.

* I revbumped the other packages that require `rtmidi`. `milkytracker` needed `pkg-config` added to `hostmakedepends`, otherwise it would fail. I packaged all of them, but I only installed milkytracker and played around with it a little.

* 32bit seems to not be available for now for this package. According to some github issues, ARM support may be possible with some patches. I also tested musl x86_64 and it failed, but possibly would work with some patches.

* Notably during testing the shareware version of Dark Forces will not work with TheForceEngine, you must use the full game.

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


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

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

From 8580ce50ba3b6e85cfe119c8cb2dd2c7ecb280c9 Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Fri, 29 Sep 2023 14:51:26 -0500
Subject: [PATCH 1/5] New package: TheForceEngine-1.09.530

---
 srcpkgs/TheForceEngine/patches/musl.patch | 10 ++++++++
 srcpkgs/TheForceEngine/template           | 28 +++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/TheForceEngine/patches/musl.patch
 create mode 100644 srcpkgs/TheForceEngine/template

diff --git a/srcpkgs/TheForceEngine/patches/musl.patch b/srcpkgs/TheForceEngine/patches/musl.patch
new file mode 100644
index 0000000000000..d1d8d0dbd67b7
--- /dev/null
+++ b/srcpkgs/TheForceEngine/patches/musl.patch
@@ -0,0 +1,10 @@
+--- a/TheForceEngine/TFE_FileSystem/fileutil-posix.cpp  2023-09-28 06:00:17.000000000 +0200
++++ -   2023-09-28 09:33:09.076014188 +0200
+@@ -2,6 +2,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <libgen.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/TheForceEngine/template b/srcpkgs/TheForceEngine/template
new file mode 100644
index 0000000000000..b63a1e5e4fb28
--- /dev/null
+++ b/srcpkgs/TheForceEngine/template
@@ -0,0 +1,28 @@
+# Template file for 'TheForceEngine'
+pkgname=TheForceEngine
+version=1.09.530
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="SDL2-devel devil-devel rtmidi-devel jack-devel glew-devel MesaLib-devel"
+depends="zenity"
+short_desc="Modern \"Jedi Engine\" replacement supporting Dark Forces and mods"
+maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+license="GPL-2.0-only"
+homepage="https://theforceengine.github.io"
+distfiles="https://github.com/luciusDXL/TheForceEngine/archive/v${version}.tar.gz"
+checksum=6b4649fe219ec0678888e7b2076017cda545f97218d5d05f29cb7604bf45097e
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libexecinfo-devel"
+	configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
+fi
+
+if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; then
+	broken="Minimum requirements state 64-bit for GPU renderer"
+fi
+
+post_install() {
+	vinstall "${pkgname}/${pkgname}.desktop" 644 usr/share/applications
+	vinstall "${pkgname}/${pkgname}.png" 644 usr/share/icons/hicolor/256x256/apps/ ${pkgname}.png
+}

From fc571df4174407dfe42ccf159313c49a330b5c53 Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Fri, 29 Sep 2023 14:53:25 -0500
Subject: [PATCH 2/5] rtmidi: update to 6.0.0

---
 common/shlibs           | 2 +-
 srcpkgs/rtmidi/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 13a439c085896..486ac3c5312b5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2978,7 +2978,7 @@ libPocoCrypto.so.94 poco-1.12.4_1
 libPtex.so ptex-2.3.2_1
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
-librtmidi.so.5 rtmidi-4.0.0_1
+librtmidi.so.7 rtmidi-6.0.0_1
 libbiblesync.so.2.1.0 biblesync-2.1.0_1
 libbac-9.4.2.so bacula-common-9.4.2_4
 libbaccfg-9.4.2.so bacula-common-9.4.2_4
diff --git a/srcpkgs/rtmidi/template b/srcpkgs/rtmidi/template
index 04bebb4104857..5341f6ccff398 100644
--- a/srcpkgs/rtmidi/template
+++ b/srcpkgs/rtmidi/template
@@ -1,17 +1,17 @@
 # Template file for 'rtmidi'
 pkgname=rtmidi
-version=4.0.0
-revision=2
+version=6.0.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-alsa --with-jack"
 hostmakedepends="automake libtool"
 makedepends="alsa-lib-devel jack-devel"
 short_desc="C++ classes for realtime MIDI input/output"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
+license="custom:RtMidi"
 homepage="http://www.music.mcgill.ca/~gary/rtmidi/"
 distfiles="https://github.com/thestk/rtmidi/archive/${version}.tar.gz"
-checksum=d32de9ceebf6d969537e9a9720925a1ac7f6a8bc4ac4ce7c58c01434f4e54f44
+checksum=ef7bcda27fee6936b651c29ebe9544c74959d0b1583b716ce80a1c6fea7617f0
 
 pre_configure() {
 	sed -n '/Copyright (c)/,$ p' < README.md > LICENSE

From 1f4e5af93df2d6b85d8007274e286cd8eb887f21 Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Fri, 29 Sep 2023 15:03:46 -0500
Subject: [PATCH 3/5] furnace: revbump for rtmidi update

---
 srcpkgs/furnace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index a0a1ff1c18051..04e888f243450 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
 # Template file for 'furnace'
 pkgname=furnace
 version=0.6pre12
-revision=1
+revision=2
 _adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
 build_wrksrc=${pkgname}-${version}
 build_style=cmake

From d0444fc4aacea072c50939f822a30b641d2c9f0e Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Fri, 29 Sep 2023 15:03:47 -0500
Subject: [PATCH 4/5] milkytracker: revbump for rtmidi update

---
 srcpkgs/milkytracker/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/milkytracker/template b/srcpkgs/milkytracker/template
index 56d48d8850a6c..92d21114adef1 100644
--- a/srcpkgs/milkytracker/template
+++ b/srcpkgs/milkytracker/template
@@ -1,8 +1,9 @@
 # Template file for 'milkytracker'
 pkgname=milkytracker
 version=1.02.00
-revision=2
+revision=3
 build_style=cmake
+hostmakedepends="pkg-config"
 makedepends="SDL2-devel zlib-devel jack-devel alsa-lib-devel rtmidi-devel"
 depends="libjack rtmidi"
 short_desc="Fast Tracker II inspired music tracker"

From 92cff88d53e8301a5e78cb61f19cd6000fd6d90e Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Fri, 29 Sep 2023 15:03:47 -0500
Subject: [PATCH 5/5] giada: revbump for rtmidi update

---
 srcpkgs/giada/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template
index a7ac263ce2f3d..9e3d2956b8545 100644
--- a/srcpkgs/giada/template
+++ b/srcpkgs/giada/template
@@ -1,7 +1,7 @@
 # Template file for 'giada'
 pkgname=giada
 version=0.17.0
-revision=1
+revision=2
 build_style=cmake
 # configure_args="--target=linux"
 hostmakedepends="cmake"