From: tranzystorekk <tranzystorekk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] furnace: update to 0.6.1
Date: Mon, 05 Feb 2024 14:07:36 +0100 [thread overview]
Message-ID: <20240205130736.892C9249A5@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48521@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages furnace
https://github.com/void-linux/void-packages/pull/48521
furnace: update to 0.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-furnace-48521.patch --]
[-- Type: text/x-diff, Size: 6664 bytes --]
From d1998da8ab117008489795cc205da0283d20fe1c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 4 Feb 2024 11:46:57 +0100
Subject: [PATCH] furnace: update to 0.6.1
---
srcpkgs/furnace/patches/fix-arm-esfm.patch | 116 +++++++++++++++++++++
srcpkgs/furnace/template | 5 +-
2 files changed, 119 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/furnace/patches/fix-arm-esfm.patch
diff --git a/srcpkgs/furnace/patches/fix-arm-esfm.patch b/srcpkgs/furnace/patches/fix-arm-esfm.patch
new file mode 100644
index 0000000000000..4caa0553624f8
--- /dev/null
+++ b/srcpkgs/furnace/patches/fix-arm-esfm.patch
@@ -0,0 +1,116 @@
+From 9529119691c5c16658bc4b2e9f4216ca8168634c Mon Sep 17 00:00:00 2001
+From: Natt Akuma <akumanatt925@gmail.com>
+Date: Sat, 3 Feb 2024 16:15:12 +0700
+Subject: [PATCH] Fix ARM ASM for later GCC versions They do Thumb-2 by default
+ for some reason
+
+---
+ extern/ESFMu/esfm.c | 76 +++++++++++++++++++++++++--------------------
+ 1 file changed, 43 insertions(+), 33 deletions(-)
+
+diff --git a/extern/ESFMu/esfm.c b/extern/ESFMu/esfm.c
+index 6c743245b..daf8d695d 100644
+--- a/extern/ESFMu/esfm.c
++++ b/extern/ESFMu/esfm.c
+@@ -1910,58 +1910,68 @@ ESFM_process_feedback(esfm_chip *chip)
+ );
+ #elif defined(__GNUC__) && defined(__arm__)
+ asm (
+- "ldr r3, =%[sinrom] \n\t"
++ "ldr r4, %[p_acc] \n\t"
++ "mov r5, #0 \n\t"
++ "mov r6, #0 \n\t"
++ "ldr r7, %[p_off] \n\t"
++ "ldrb r8, %[mod_in] \n\t"
++ "ldrh r9, %[eg_out] \n\t"
++ "ldr r10, =%c[sinrom] \n\t"
+ "ldrb r0, %[wave] \n\t"
+- "add r3, r3, r0, lsl #11 \n\t"
+- "mov r4, #0 \n\t"
+- "mov %[out], #0 \n\t"
+- "ldr r5, =0x1fff<<1 \n\t"
+- "ldr r6, =0xff<<1 \n\t"
+- "mov r2, #29 \n"
++ "add r10, r10, r0, lsl #11 \n\t"
++ "ldr r11, =%c[exprom] \n\t"
++ "ldr r12, =0x1fff<<1 \n\t"
++ "ldr lr, =0xff<<1 \n\t"
++ "movs r2, #29 \n"
+ "1: \n\t"
+ // phase_feedback = (wave_out + wave_last) >> 2;
+- "add %[p_fb], %[out], r4 \n\t"
+- "asr %[p_fb], %[p_fb], #2 \n\t"
++ "adds r3, r5, r6 \n\t"
++ "asrs r3, r3, #2 \n\t"
+ // wave_last = wave_out
+- "mov r4, %[out] \n\t"
++ "mov r6, r5 \n\t"
+ // phase = phase_feedback >> mod_in_shift;
+- "asr r0, %[p_fb], %[mod_in] \n\t"
++ "asr r0, r3, r8 \n\t"
+ // phase += phase_acc >> 9;
+- "add r0, r0, %[p_acc], asr #9 \n\t"
++ "add r0, r0, r4, asr #9 \n\t"
+ // lookup = logsinrom[(waveform << 10) | (phase & 0x3ff)];
+- "lsl r0, r0, #22 \n\t"
+- "add r0, r3, r0, lsr #21 \n\t"
+- "ldrsh r1, [r0] \n\t"
++ "lsls r0, r0, #22 \n\t"
++ "lsrs r0, r0, #21 \n\t"
++ "ldrsh r1, [r3, r0] \n\t"
+ // level = (lookup & 0x1fff) + (envelope << 3);
+- "and r0, r5, r1, lsl #1 \n\t"
+- "add r0, r0, %[eg_out], lsl #4 \n\t"
++ "and r0, r12, r1, lsl #1 \n\t"
++ "add r0, r0, r9, lsl #4 \n\t"
+ // if (level > 0x1fff) level = 0x1fff;
+- "cmp r0, r5 \n\t"
+- "movhi r0, r5 \n\t"
++ "cmp r0, r12 \n\t"
++ "it hi \n\t"
++ "movhi r0, r12 \n\t"
+ // wave_out = exprom[level & 0xff] >> (level >> 8);
+- "lsr %[out], r0, #9 \n\t"
+- "and r0, r0, r6 \n\t"
+- "ldrh r0, [%[exprom], r0] \n\t"
+- "lsr %[out], r0, %[out] \n\t"
++ "lsrs r5, r0, #9 \n\t"
++ "and r0, r0, lr \n\t"
++ "ldrh r0, [r11, r0] \n\t"
++ "lsr r5, r0, r5 \n\t"
+ // if (lookup & 0x8000) wave_out = -wave_out;
+ // in other words, lookup is negative
+ "tst r1, r1 \n\t"
+- "negmi %[out], %[out] \n\t"
++ "it mi \n\t"
++ "negmi r5, r5 \n\t"
+ // phase_acc += phase_offset
+- "add %[p_acc], %[p_acc], %[p_off]\n\t"
++ "add r4, r4, r7 \n\t"
+ // loop
+ "subs r2, r2, #1 \n\t"
+ "bne 1b \n\t"
+- : [p_fb] "=&r" (phase_feedback),
+- [p_acc] "+r" (phase_acc),
+- [out] "=&r" (wave_out)
+- : [p_off] "r" (phase_offset),
+- [mod_in] "r" (mod_in_shift),
++ "str r3, %[p_fb] \n\t"
++ "str r4, %[p_acc] \n\t"
++ "str r5, %[out] \n\t"
++ : [p_fb] "=m" (phase_feedback),
++ [p_acc] "+m" (phase_acc),
++ [out] "=m" (wave_out)
++ : [p_off] "m" (phase_offset),
++ [mod_in] "m" (mod_in_shift),
+ [wave] "m" (waveform),
+- [eg_out] "r" (eg_output),
++ [eg_out] "m" (eg_output),
+ [sinrom] "i" (logsinrom),
+- [exprom] "r" (exprom)
+- : "cc", "r0", "r1", "r2", "r3", "r4", "r5", "r6"
++ [exprom] "i" (exprom)
++ : "cc", "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "lr"
+ );
+ #else
+ wave_out = 0;
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index b6f9850d185b8..e29d37fb4cda5 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,6 +1,6 @@
# Template file for 'furnace'
pkgname=furnace
-version=0.6
+version=0.6.1
revision=1
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_wrksrc=${pkgname}-${version}
@@ -15,8 +15,9 @@ license="GPL-2.0-or-later"
homepage="https://github.com/tildearrow/furnace"
distfiles="https://github.com/tildearrow/furnace/archive/refs/tags/v${version}.tar.gz
https://github.com/superctr/adpcm/archive/${_adpcm_commit}.tar.gz"
-checksum="d7d40da0234f379a689e8d5ad925e097e0ef487a72fe8d5c1b050cdc18f7fb44
+checksum="4af60c47c3070a176e9edf03663a6319d219083b25f9b43234bd0acfdf62a6b0
46da29342d2968ff222ba00e07c646e038b76af2e6c86de037c653059a056251"
+patch_args="-Np1 --directory=${build_wrksrc}"
post_extract() {
mv -T adpcm-${_adpcm_commit} ${pkgname}-${version}/extern/adpcm
next prev parent reply other threads:[~2024-02-05 13:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-04 10:58 [PR PATCH] " tranzystorekk
2024-02-04 11:19 ` [PR PATCH] [Updated] " tranzystorekk
2024-02-04 11:42 ` tranzystorekk
2024-02-05 13:07 ` tranzystorekk [this message]
2024-02-05 13:31 ` tranzystorekk
2024-02-10 2:16 ` [PR PATCH] [Merged]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240205130736.892C9249A5@inbox.vuxu.org \
--to=tranzystorekk@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).