Re: [PR PATCH] [Updated] NoiseTorch: update to 0.12.2.

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

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

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

https://github.com/yoshiyoshyosh/void-packages noisetorch-0.12.2
https://github.com/void-linux/void-packages/pull/43646

NoiseTorch: update to 0.12.2.
#### Testing the changes
- I tested the changes in this PR: **Briefly**

- I built this PR locally for my native architecture, (x86_64-glibc)

Addresses #41656 and #42403.
I tried building using `rnnoise-devel`; it would build without errors, but would not actually function when testing. Because of this, I'm pretty sure the `*.c` files from rnnoise are required to build the ladspa library that gets integrated into this, so I used the vendored submodules.
Everything seems to work, but I only tried with pipewire (I doubt it'd break anywhere else if pipewire's working fine)

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

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

From 4158fa26ee13341cc3bd3b634b9e8637996ca27f Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Wed, 26 Apr 2023 23:34:05 -0400
Subject: [PATCH] NoiseTorch: update to 0.12.2.

---
 .../patches/dont-fetch-submods.patch          | 11 ++++++++++
 srcpkgs/NoiseTorch/template                   | 22 ++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/NoiseTorch/patches/dont-fetch-submods.patch

diff --git a/srcpkgs/NoiseTorch/patches/dont-fetch-submods.patch b/srcpkgs/NoiseTorch/patches/dont-fetch-submods.patch
new file mode 100644
index 000000000000..3d7e7aaab9f3
--- /dev/null
+++ b/srcpkgs/NoiseTorch/patches/dont-fetch-submods.patch
@@ -0,0 +1,11 @@
+Don't fetch submodules, since xbps-src does already.
+diff --git a/Makefile b/Makefile
+index ae252c0..6409106 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,5 +28,4 @@ release: rnnoise
+ 	rm -rf tmp/
+ 	go run scripts/signer.go -s -f bin/NoiseTorch_x64_${VERSION}.tgz
+ rnnoise:
+-	git submodule update --init --recursive
+ 	$(MAKE) -C c/ladspa
diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index a9e9fb2c92d4..8fa51fb423be 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,17 +1,29 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
-version=0.11.4
+version=0.12.2
 revision=1
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"
 go_import_path="noisetorch"
 depends="libcap-progs"
 short_desc="Real-time microphone noise suppression on Linux"
-maintainer="Soc Virnyl S. Estela <renegan.ronin@gmail.com>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/lawl/NoiseTorch"
-distfiles="https://github.com/lawl/NoiseTorch/archive/${version}.tar.gz"
-checksum=3da6cad119ecca6f4e131c8bca86eb122d2363d5d30dcd1da41974af5887a3c1
+homepage="https://github.com/NoiseTorch/NoiseTorch"
+_c_ringbuf_commit=2037560fb90dea5d2538611d983964d790bdbac2
+_rnnoise_commit=1cbdbcf1283499bbb2230a6b0f126eb9b236defd
+distfiles="https://github.com/NoiseTorch/NoiseTorch/archive/v${version}.tar.gz
+https://github.com/NoiseTorch/c-ringbuf/archive/${_c_ringbuf_commit}.tar.gz
+https://github.com/NoiseTorch/rnnoise/archive/${_rnnoise_commit}.tar.gz"
+checksum="4a30650314a6f83d979f3303d49618847ba58e39e3e26482dfe58b5e261c5611
+877b08413c59baac56b4cc7720fa56cf0eb399192a0ec652ce7b590c9cd9ad8a
+68c7ab4e408426088603e19955e746bb2a412d84bb121b6f39834c60fc8068b7"
+
+post_extract() {
+	mv NoiseTorch-${version}/* .
+	mv c-ringbuf-${_c_ringbuf_commit}/* c/c-ringbuf
+	mv rnnoise-${_rnnoise_commit}/* c/rnnoise
+}
 
 pre_build() {
 	make rnnoise