From 30cfd7ef82aa6ee4936971ff7f8f7da516af141a Mon Sep 17 00:00:00 2001 From: Marcin Puc 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 " 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 }