* [PR PATCH] furnace: update to 0.6.2
@ 2024-04-01 20:29 tranzystorekk
2024-04-16 19:23 ` [PR PATCH] [Updated] " tranzystorekk
2024-04-16 22:02 ` [PR PATCH] [Merged]: " cinerea0
0 siblings, 2 replies; 3+ messages in thread
From: tranzystorekk @ 2024-04-01 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is a new 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/49657
furnace: update to 0.6.2
<!-- 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/49657.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-furnace-49657.patch --]
[-- Type: text/x-diff, Size: 2783 bytes --]
From c8b7acb4a185e62df00cec61e836a88042fb9e3c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 1 Apr 2024 22:28:05 +0200
Subject: [PATCH] furnace: update to 0.6.2
---
srcpkgs/furnace/patches/disable-arm-esfm.patch | 13 -------------
srcpkgs/furnace/template | 12 ++++++++----
2 files changed, 8 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/furnace/patches/disable-arm-esfm.patch
diff --git a/srcpkgs/furnace/patches/disable-arm-esfm.patch b/srcpkgs/furnace/patches/disable-arm-esfm.patch
deleted file mode 100644
index 6f80f83c499843..00000000000000
--- a/srcpkgs/furnace/patches/disable-arm-esfm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/extern/ESFMu/esfm.c b/extern/ESFMu/esfm.c
-index 6c74324..a07571f 100644
---- a/extern/ESFMu/esfm.c
-+++ b/extern/ESFMu/esfm.c
-@@ -1908,7 +1908,7 @@ ESFM_process_feedback(esfm_chip *chip)
- [i] "m" (iter_counter)
- : "cc", "ax", "bx", "cx", "di"
- );
--#elif defined(__GNUC__) && defined(__arm__)
-+#elif defined(__GNUC__) && defined(__arm__) && 0
- asm (
- "ldr r3, =%[sinrom] \n\t"
- "ldrb r0, %[wave] \n\t"
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index e29d37fb4cda5f..483835cf1708e6 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,8 +1,9 @@
# Template file for 'furnace'
pkgname=furnace
-version=0.6.1
+version=0.6.2
revision=1
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
+_adpcm_xq_commit="6220fed7655e86a29702b45dbc641a028ed5a4bf"
build_wrksrc=${pkgname}-${version}
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_LIBSNDFILE=ON -DSYSTEM_PORTAUDIO=ON -DSYSTEM_RTMIDI=ON
@@ -14,11 +15,14 @@ maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
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="4af60c47c3070a176e9edf03663a6319d219083b25f9b43234bd0acfdf62a6b0
- 46da29342d2968ff222ba00e07c646e038b76af2e6c86de037c653059a056251"
+ https://github.com/superctr/adpcm/archive/${_adpcm_commit}.tar.gz
+ https://github.com/dbry/adpcm-xq/archive/${_adpcm_xq_commit}.tar.gz"
+checksum="e01df9ea9c5c625e7f3cbd59df34ab066be5b6d4e8675d445c62e4e1a5915476
+ 46da29342d2968ff222ba00e07c646e038b76af2e6c86de037c653059a056251
+ 601cf3905e7843f3d1477237a8ba358af08fa000ff8944651f40c986c7f57cff"
patch_args="-Np1 --directory=${build_wrksrc}"
post_extract() {
mv -T adpcm-${_adpcm_commit} ${pkgname}-${version}/extern/adpcm
+ mv -T adpcm-xq-${_adpcm_xq_commit} ${pkgname}-${version}/extern/adpcm-xq
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] furnace: update to 0.6.2
2024-04-01 20:29 [PR PATCH] furnace: update to 0.6.2 tranzystorekk
@ 2024-04-16 19:23 ` tranzystorekk
2024-04-16 22:02 ` [PR PATCH] [Merged]: " cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: tranzystorekk @ 2024-04-16 19:23 UTC (permalink / raw)
To: ml
[-- 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/49657
furnace: update to 0.6.2
<!-- 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/49657.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-furnace-49657.patch --]
[-- Type: text/x-diff, Size: 2941 bytes --]
From 30cfd7ef82aa6ee4936971ff7f8f7da516af141a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 1 Apr 2024 22:28:05 +0200
Subject: [PATCH] furnace: update to 0.6.2
---
.../furnace/patches/disable-arm-esfm.patch | 13 ------------
srcpkgs/furnace/template | 20 ++++++++++++-------
2 files changed, 13 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/furnace/patches/disable-arm-esfm.patch
diff --git a/srcpkgs/furnace/patches/disable-arm-esfm.patch b/srcpkgs/furnace/patches/disable-arm-esfm.patch
deleted file mode 100644
index 6f80f83c499843..00000000000000
--- a/srcpkgs/furnace/patches/disable-arm-esfm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/extern/ESFMu/esfm.c b/extern/ESFMu/esfm.c
-index 6c74324..a07571f 100644
---- a/extern/ESFMu/esfm.c
-+++ b/extern/ESFMu/esfm.c
-@@ -1908,7 +1908,7 @@ ESFM_process_feedback(esfm_chip *chip)
- [i] "m" (iter_counter)
- : "cc", "ax", "bx", "cx", "di"
- );
--#elif defined(__GNUC__) && defined(__arm__)
-+#elif defined(__GNUC__) && defined(__arm__) && 0
- asm (
- "ldr r3, =%[sinrom] \n\t"
- "ldrb r0, %[wave] \n\t"
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index e29d37fb4cda5f..ea05aeebdc4d98 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,9 +1,9 @@
# Template file for 'furnace'
pkgname=furnace
-version=0.6.1
+version=0.6.2
revision=1
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
-build_wrksrc=${pkgname}-${version}
+_adpcm_xq_commit="6220fed7655e86a29702b45dbc641a028ed5a4bf"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_LIBSNDFILE=ON -DSYSTEM_PORTAUDIO=ON -DSYSTEM_RTMIDI=ON
-DSYSTEM_SDL2=ON -DSYSTEM_ZLIB=ON"
@@ -14,11 +14,17 @@ maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
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="4af60c47c3070a176e9edf03663a6319d219083b25f9b43234bd0acfdf62a6b0
- 46da29342d2968ff222ba00e07c646e038b76af2e6c86de037c653059a056251"
-patch_args="-Np1 --directory=${build_wrksrc}"
+ https://github.com/superctr/adpcm/archive/${_adpcm_commit}.tar.gz
+ https://github.com/dbry/adpcm-xq/archive/${_adpcm_xq_commit}.tar.gz"
+checksum="e01df9ea9c5c625e7f3cbd59df34ab066be5b6d4e8675d445c62e4e1a5915476
+ 46da29342d2968ff222ba00e07c646e038b76af2e6c86de037c653059a056251
+ 601cf3905e7843f3d1477237a8ba358af08fa000ff8944651f40c986c7f57cff"
+
+skip_extraction="
+ ${_adpcm_commit}.tar.gz
+ ${_adpcm_xq_commit}.tar.gz"
post_extract() {
- mv -T adpcm-${_adpcm_commit} ${pkgname}-${version}/extern/adpcm
+ vsrcextract -C extern/adpcm ${_adpcm_commit}.tar.gz
+ vsrcextract -C extern/adpcm-xq ${_adpcm_xq_commit}.tar.gz
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: furnace: update to 0.6.2
2024-04-01 20:29 [PR PATCH] furnace: update to 0.6.2 tranzystorekk
2024-04-16 19:23 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-04-16 22:02 ` cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: cinerea0 @ 2024-04-16 22:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
There's a merged pull request on the void-packages repository
furnace: update to 0.6.2
https://github.com/void-linux/void-packages/pull/49657
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-16 22:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-01 20:29 [PR PATCH] furnace: update to 0.6.2 tranzystorekk
2024-04-16 19:23 ` [PR PATCH] [Updated] " tranzystorekk
2024-04-16 22:02 ` [PR PATCH] [Merged]: " cinerea0
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).