* [PR PATCH] New package: TheForceEngine-1.09.410
@ 2023-08-24 21:00 kedodrill
2023-08-25 14:54 ` [PR REVIEW] " Chocimier
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: kedodrill @ 2023-08-24 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2033 bytes --]
There is a new 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.410
<!-- 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: 4284 bytes --]
From 1451b17d381db417b9046dcbe51fdf87ebd8b6ac Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Thu, 24 Aug 2023 15:49:45 -0500
Subject: [PATCH] New package: TheForceEngine-1.09.410
---
common/shlibs | 2 +-
srcpkgs/TheForceEngine/template | 21 +++++++++++++++++++++
srcpkgs/furnace/template | 2 +-
srcpkgs/giada/template | 2 +-
srcpkgs/milkytracker/template | 3 ++-
srcpkgs/rtmidi/template | 8 ++++----
6 files changed, 30 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/TheForceEngine/template
diff --git a/common/shlibs b/common/shlibs
index f1ca9ce4870d1..f21d21c68caa7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3045,7 +3045,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/TheForceEngine/template b/srcpkgs/TheForceEngine/template
new file mode 100644
index 0000000000000..e3d46a51b38ea
--- /dev/null
+++ b/srcpkgs/TheForceEngine/template
@@ -0,0 +1,21 @@
+# Template file for 'TheForceEngine'
+pkgname=TheForceEngine
+version=1.09.410
+revision=1
+archs="x86_64"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="pkg-config"
+makedepends="SDL2-devel devil-devel rtaudio-devel jack-devel rtmidi-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=0f2b284190b7492d45f0f16ed7897cfd8ef5a5c22c1d3d512e9d8c7efb20e6b0
+
+post_install() {
+ vinstall "${pkgname}/${pkgname}.desktop" 644 usr/share/applications
+ vinstall "${pkgname}/${pkgname}.png" 644 usr/share/icons/hicolor/256x256/apps/ ${pkgname}.png
+}
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index 398a0c1d705a2..76aa810c8923b 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6pre8
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_wrksrc=${pkgname}-${version}
build_style=cmake
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"
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"
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: TheForceEngine-1.09.410
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
@ 2023-08-25 14:54 ` Chocimier
2023-08-25 14:54 ` Chocimier
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Chocimier @ 2023-08-25 14:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#discussion_r1305770159
Comment:
- builds fine on aarch
- this should be replaced with `case $XBPS_TARGET_MACHINE in somearch): broken="specific reason"`
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: TheForceEngine-1.09.410
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
2023-08-25 14:54 ` [PR REVIEW] " Chocimier
@ 2023-08-25 14:54 ` Chocimier
2023-08-25 19:47 ` kedodrill
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Chocimier @ 2023-08-25 14:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#discussion_r1305770189
Comment:
What's wrong with our defaults for CMAKE_BUILD_TYPE?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: TheForceEngine-1.09.410
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
2023-08-25 14:54 ` [PR REVIEW] " Chocimier
2023-08-25 14:54 ` Chocimier
@ 2023-08-25 19:47 ` kedodrill
2023-08-25 19:49 ` kedodrill
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-08-25 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#discussion_r1306089983
Comment:
I removed it and it still works so I'll update for that.
https://github.com/void-linux/void-packages/blob/cbd64671f6059fe5553828532eae10df2cae8158/common/build-style/cmake.sh#L56 just curious does this mean our CMAKE_BUILD_TYPE is usually `None`? Or does it get set to something else later?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: TheForceEngine-1.09.410
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (2 preceding siblings ...)
2023-08-25 19:47 ` kedodrill
@ 2023-08-25 19:49 ` kedodrill
2023-08-25 21:47 ` [PR PATCH] [Updated] " kedodrill
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-08-25 19:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#discussion_r1306091202
Comment:
great, thank you for building that. I will find an example and update the template
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: TheForceEngine-1.09.410
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (3 preceding siblings ...)
2023-08-25 19:49 ` kedodrill
@ 2023-08-25 21:47 ` kedodrill
2023-09-28 5:00 ` kedodrill
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-08-25 21:47 UTC (permalink / raw)
To: ml
[-- 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.410
<!-- 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: 4582 bytes --]
From a7af2bcd0b3af4fe9c476fbe4e7145adca6f6d1e Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Thu, 24 Aug 2023 15:49:45 -0500
Subject: [PATCH] New package: TheForceEngine-1.09.410
---
common/shlibs | 2 +-
srcpkgs/TheForceEngine/template | 26 ++++++++++++++++++++++++++
srcpkgs/furnace/template | 2 +-
srcpkgs/giada/template | 2 +-
srcpkgs/milkytracker/template | 3 ++-
srcpkgs/rtmidi/template | 8 ++++----
6 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/TheForceEngine/template
diff --git a/common/shlibs b/common/shlibs
index f1ca9ce4870d1..f21d21c68caa7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3045,7 +3045,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/TheForceEngine/template b/srcpkgs/TheForceEngine/template
new file mode 100644
index 0000000000000..bf7948e43f7d9
--- /dev/null
+++ b/srcpkgs/TheForceEngine/template
@@ -0,0 +1,26 @@
+# Template file for 'TheForceEngine'
+pkgname=TheForceEngine
+version=1.09.410
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="SDL2-devel devil-devel rtaudio-devel jack-devel rtmidi-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=0f2b284190b7492d45f0f16ed7897cfd8ef5a5c22c1d3d512e9d8c7efb20e6b0
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ ppc*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ arm*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ *-musl) broken="FAILED: CMakeFiles/tfe.dir/TheForceEngine/TFE_FileSystem/fileutil-posix.cpp.o" ;;
+esac
+
+post_install() {
+ vinstall "${pkgname}/${pkgname}.desktop" 644 usr/share/applications
+ vinstall "${pkgname}/${pkgname}.png" 644 usr/share/icons/hicolor/256x256/apps/ ${pkgname}.png
+}
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index 398a0c1d705a2..76aa810c8923b 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6pre8
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_wrksrc=${pkgname}-${version}
build_style=cmake
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"
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"
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: TheForceEngine-1.09.410
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (4 preceding siblings ...)
2023-08-25 21:47 ` [PR PATCH] [Updated] " kedodrill
@ 2023-09-28 5:00 ` kedodrill
2023-09-28 5:22 ` [PR PATCH] [Updated] New package: TheForceEngine-1.09.530 kedodrill
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-28 5:00 UTC (permalink / raw)
To: ml
[-- 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.410
<!-- 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: 4140 bytes --]
From 619b69d209ee67defbf30e1c513f86df4a7df38b Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Thu, 24 Aug 2023 15:49:45 -0500
Subject: [PATCH] New package: TheForceEngine-1.09.530
---
common/shlibs | 2 +-
srcpkgs/TheForceEngine/template | 26 ++++++++++++++++++++++++++
srcpkgs/giada/template | 2 +-
srcpkgs/milkytracker/template | 3 ++-
srcpkgs/rtmidi/template | 8 ++++----
5 files changed, 34 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/TheForceEngine/template
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/TheForceEngine/template b/srcpkgs/TheForceEngine/template
new file mode 100644
index 0000000000000..18d7c389d8bb3
--- /dev/null
+++ b/srcpkgs/TheForceEngine/template
@@ -0,0 +1,26 @@
+# 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
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ ppc*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ arm*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ *-musl) broken="FAILED: CMakeFiles/tfe.dir/TheForceEngine/TFE_FileSystem/fileutil-posix.cpp.o" ;;
+esac
+
+post_install() {
+ vinstall "${pkgname}/${pkgname}.desktop" 644 usr/share/applications
+ vinstall "${pkgname}/${pkgname}.png" 644 usr/share/icons/hicolor/256x256/apps/ ${pkgname}.png
+}
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"
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"
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (5 preceding siblings ...)
2023-09-28 5:00 ` kedodrill
@ 2023-09-28 5:22 ` kedodrill
2023-09-28 7:43 ` Johnnynator
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-28 5:22 UTC (permalink / raw)
To: ml
[-- 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: 4569 bytes --]
From eff442baa11c50dd69257d3db70dbce9b64b7c1f Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <hello@kennydodrill.com>
Date: Thu, 24 Aug 2023 15:49:45 -0500
Subject: [PATCH] New package: TheForceEngine-1.09.530
---
common/shlibs | 2 +-
srcpkgs/TheForceEngine/template | 26 ++++++++++++++++++++++++++
srcpkgs/furnace/template | 2 +-
srcpkgs/giada/template | 2 +-
srcpkgs/milkytracker/template | 3 ++-
srcpkgs/rtmidi/template | 8 ++++----
6 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/TheForceEngine/template
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/TheForceEngine/template b/srcpkgs/TheForceEngine/template
new file mode 100644
index 0000000000000..18d7c389d8bb3
--- /dev/null
+++ b/srcpkgs/TheForceEngine/template
@@ -0,0 +1,26 @@
+# 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
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ ppc*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ arm*) broken="Minimum requirements state 64-bit for GPU renderer" ;;
+ *-musl) broken="FAILED: CMakeFiles/tfe.dir/TheForceEngine/TFE_FileSystem/fileutil-posix.cpp.o" ;;
+esac
+
+post_install() {
+ vinstall "${pkgname}/${pkgname}.desktop" 644 usr/share/applications
+ vinstall "${pkgname}/${pkgname}.png" 644 usr/share/icons/hicolor/256x256/apps/ ${pkgname}.png
+}
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
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"
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"
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
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (6 preceding siblings ...)
2023-09-28 5:22 ` [PR PATCH] [Updated] New package: TheForceEngine-1.09.530 kedodrill
@ 2023-09-28 7:43 ` Johnnynator
2023-09-28 7:43 ` [PR REVIEW] " Johnnynator
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-28 7:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 699 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1738642547
Comment:
Musl should be an easy fix. I did not runtime test it yet.
```
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
fi
```
`musl.patch`
--- 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>
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (7 preceding siblings ...)
2023-09-28 7:43 ` Johnnynator
@ 2023-09-28 7:43 ` Johnnynator
2023-09-28 7:44 ` Johnnynator
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-28 7:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#discussion_r1339676040
Comment:
```suggestion
if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; then
broken="Minimum requirements state 64-bit for GPU renderer" ;;
fi
```
Checking `XBPS_TARGET_WORDSIZE` instead of listing all 32bit architectures is more sensible.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (8 preceding siblings ...)
2023-09-28 7:43 ` [PR REVIEW] " Johnnynator
@ 2023-09-28 7:44 ` Johnnynator
2023-09-28 7:44 ` Johnnynator
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-28 7:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1738642547
Comment:
Musl should be an easy fix. I did not runtime test it yet.
```
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
fi
```
`musl.patch`
```
--- 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>
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (9 preceding siblings ...)
2023-09-28 7:44 ` Johnnynator
@ 2023-09-28 7:44 ` Johnnynator
2023-09-28 7:45 ` Johnnynator
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-28 7:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1738642547
Comment:
Musl should be an easy fix. I did not runtime test it yet.
```
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
fi
```
`musl.patch`
```patch
--- 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>
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (10 preceding siblings ...)
2023-09-28 7:44 ` Johnnynator
@ 2023-09-28 7:45 ` Johnnynator
2023-09-28 22:56 ` kedodrill
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-28 7:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1738644419
Comment:
Please split your one commit into one commit per package.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (11 preceding siblings ...)
2023-09-28 7:45 ` Johnnynator
@ 2023-09-28 22:56 ` kedodrill
2023-09-28 22:56 ` kedodrill
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-28 22:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 464 bytes --]
New comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1740100954
Comment:
@Johnnynator Thank you for the musl patch! I was able to build it successfully, but I'm on glibc so didn't test.
> Please split your one commit into one commit per package.
I can certainly do that, would I need to disable builds on this PR then since it depends on rtmidi getting bumped? Otherwise they would fail.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (12 preceding siblings ...)
2023-09-28 22:56 ` kedodrill
@ 2023-09-28 22:56 ` kedodrill
2023-09-28 22:57 ` [PR REVIEW] " kedodrill
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-28 22:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
New comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1740100954
Comment:
@Johnnynator Thank you for the musl patch! I was able to build it successfully, but I'm on glibc so didn't test.
> Please split your one commit into one commit per package.
I can certainly do that, would I need to disable builds on this PR then since it depends on rtmidi getting bumped? Otherwise this package build would fail.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (13 preceding siblings ...)
2023-09-28 22:56 ` kedodrill
@ 2023-09-28 22:57 ` kedodrill
2023-09-29 11:23 ` Johnnynator
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-28 22:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#discussion_r1340733224
Comment:
Much simpler, thank you!
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (14 preceding siblings ...)
2023-09-28 22:57 ` [PR REVIEW] " kedodrill
@ 2023-09-29 11:23 ` Johnnynator
2023-09-29 20:04 ` [PR PATCH] [Updated] " kedodrill
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-29 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1740734912
Comment:
You can push it all into this Pull Request. Just as separate commits.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (15 preceding siblings ...)
2023-09-29 11:23 ` Johnnynator
@ 2023-09-29 20:04 ` kedodrill
2023-09-29 20:04 ` kedodrill
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-29 20:04 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (16 preceding siblings ...)
2023-09-29 20:04 ` [PR PATCH] [Updated] " kedodrill
@ 2023-09-29 20:04 ` kedodrill
2023-09-29 22:44 ` Johnnynator
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-29 20:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
New comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1741419469
Comment:
> You can push it all into this Pull Request. Just as separate commits.
Oops, yeah for some reason thought you meant separate PRs. cool, okay got all those changes in
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (17 preceding siblings ...)
2023-09-29 20:04 ` kedodrill
@ 2023-09-29 22:44 ` Johnnynator
2023-09-29 22:44 ` [PR PATCH] [Merged]: " Johnnynator
2023-09-30 0:58 ` kedodrill
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-29 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1741557644
Comment:
Could steal death star plans on a musl system. 10/10 would recommend.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Merged]: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (18 preceding siblings ...)
2023-09-29 22:44 ` Johnnynator
@ 2023-09-29 22:44 ` Johnnynator
2023-09-30 0:58 ` kedodrill
20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2023-09-29 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1871 bytes --]
There's a merged pull request on the void-packages repository
New package: TheForceEngine-1.09.530
https://github.com/void-linux/void-packages/pull/45745
Description:
<!-- 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)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: TheForceEngine-1.09.530
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
` (19 preceding siblings ...)
2023-09-29 22:44 ` [PR PATCH] [Merged]: " Johnnynator
@ 2023-09-30 0:58 ` kedodrill
20 siblings, 0 replies; 22+ messages in thread
From: kedodrill @ 2023-09-30 0:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/45745#issuecomment-1741611079
Comment:
> Could steal death star plans on a musl system. 10/10 would recommend.
lol, thanks for testing it!
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2023-09-30 0:58 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-24 21:00 [PR PATCH] New package: TheForceEngine-1.09.410 kedodrill
2023-08-25 14:54 ` [PR REVIEW] " Chocimier
2023-08-25 14:54 ` Chocimier
2023-08-25 19:47 ` kedodrill
2023-08-25 19:49 ` kedodrill
2023-08-25 21:47 ` [PR PATCH] [Updated] " kedodrill
2023-09-28 5:00 ` kedodrill
2023-09-28 5:22 ` [PR PATCH] [Updated] New package: TheForceEngine-1.09.530 kedodrill
2023-09-28 7:43 ` Johnnynator
2023-09-28 7:43 ` [PR REVIEW] " Johnnynator
2023-09-28 7:44 ` Johnnynator
2023-09-28 7:44 ` Johnnynator
2023-09-28 7:45 ` Johnnynator
2023-09-28 22:56 ` kedodrill
2023-09-28 22:56 ` kedodrill
2023-09-28 22:57 ` [PR REVIEW] " kedodrill
2023-09-29 11:23 ` Johnnynator
2023-09-29 20:04 ` [PR PATCH] [Updated] " kedodrill
2023-09-29 20:04 ` kedodrill
2023-09-29 22:44 ` Johnnynator
2023-09-29 22:44 ` [PR PATCH] [Merged]: " Johnnynator
2023-09-30 0:58 ` kedodrill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).