From b00f9093a29a6b5c7295390c056cf8c002aa2510 Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Tue, 31 May 2022 03:04:08 +0000
Subject: [PATCH] testing/faust: upgrade to 2.40.0
---
testing/faust/APKBUILD | 11 +++---
testing/faust/faust-tests-old-libraries.patch | 35 -------------------
2 files changed, 5 insertions(+), 41 deletions(-)
delete mode 100644 testing/faust/faust-tests-old-libraries.patch
diff --git a/testing/faust/APKBUILD b/testing/faust/APKBUILD
index 01f1ca90b788..56080b510688 100644
--- a/testing/faust/APKBUILD
+++ b/testing/faust/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Francesco Camuffo <dev@fmac.xyz>
# Maintainer: Francesco Camuffo <dev@fmac.xyz>
pkgname=faust
-pkgver=2.37.3
+pkgver=2.40.0
pkgrel=0
pkgdesc="Functional programming language for realtime audio signal processing"
url="https://faust.grame.fr"
-arch="all !armhf !armv7" # ftbfs
+arch="all"
license="GPL-2.0-or-later"
checkdepends="bash"
makedepends="
@@ -25,7 +25,6 @@ subpackages="
"
source="$pkgname-$pkgver.tar.gz::https://github.com/grame-cncm/faust/releases/download/$pkgver/faust-$pkgver.tar.gz
faust-musl-stacktrace.patch
- faust-tests-old-libraries.patch
"
build() {
@@ -58,7 +57,8 @@ package() {
"$pkgdir"/usr/share/faust/AU \
"$pkgdir"/usr/share/faust/android \
"$pkgdir"/usr/share/faust/iOS \
- "$pkgdir"/usr/share/faust/smartKeyboard
+ "$pkgdir"/usr/share/faust/smartKeyboard \
+ "$pkgdir"/usr/share/faust/max-msp/sndfile
# rename generically named usage script
mv "$pkgdir"/usr/bin/usage.sh "$pkgdir"/usr/bin/faust-usage.sh
}
@@ -86,7 +86,6 @@ vim() {
}
sha512sums="
-29c27c1d4b71f63e5a42abdb1557e88ac9d623242a85df16478756a7bcbc3fe78466ace1280ea6a3cd04c979201e52a703f7be53b8a047dcc1f8fa7e034ef26d faust-2.37.3.tar.gz
+7ecb334b95042caa3a44ecbb711a972b6f979afca4c67fc4f32acf548ed85472e941c6590a139464aeb5266c3e88fe639e2060a110a98e88fd7b1994e0a87650 faust-2.40.0.tar.gz
f3e07bdd26ab8f0ffbf0c0dfbf8141facc07d2db05346f3b982faca613aa5ecad8986683db8d49caed720d58b183b215d6e1c4ceef069f29f41bcfa699ad5f28 faust-musl-stacktrace.patch
-fe0b800809ea1fcb4fd44e306eff7f01b9316ddc3406bdc52f0e783a3710b5b8e6e05a5925766e4fd73666cc6ca9f42027f608c7f7dbe44436b28e1787703595 faust-tests-old-libraries.patch
"
diff --git a/testing/faust/faust-tests-old-libraries.patch b/testing/faust/faust-tests-old-libraries.patch
deleted file mode 100644
index 26f3d53e0e16..000000000000
--- a/testing/faust/faust-tests-old-libraries.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 974d4da02b525261d934a9eb70e41a1c4ee309c3 Mon Sep 17 00:00:00 2001
-From: Stephane Letz <letz@grame.fr>
-Date: Fri, 7 Jan 2022 18:27:52 +0100
-Subject: [PATCH] Correct compile-tests to be used even if faust is not
- installed.
-
----
- tests/compile-tests/Make.lang | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tests/compile-tests/Make.lang b/tests/compile-tests/Make.lang
-index 3e27a69ac..7fd5ffa9b 100644
---- a/tests/compile-tests/Make.lang
-+++ b/tests/compile-tests/Make.lang
-@@ -13,7 +13,8 @@ MAKE ?= make
-
- SAMPLESROOT := ../..
- REGRESSION := ..
--FAUSTLIBS ?= ../../libraries
-+FAUSTLIBS1 ?= ../../libraries
-+FAUSTLIBS2 ?= ../../libraries/old
-
- FAUSTOPTIONS ?=
- outdir ?= cpp
-@@ -75,8 +76,8 @@ $(version)/$(outdir):
- # generic rule rule for $(lang) output
- $(version)/$(outdir)/%.$(ext): $(SAMPLESROOT)/%.dsp
- @[ -d $(@D) ] || mkdir -p $(@D)
-- $(FAUST) -lang $(lang) -I $(FAUSTLIBS) $(FAUSTOPTIONS) $< -o $@
-+ $(FAUST) -lang $(lang) -I $(FAUSTLIBS1) -I $(FAUSTLIBS2) $(FAUSTOPTIONS) $< -o $@
-
- $(version)/$(outdir)/%.$(ext): $(REGRESSION)/%.dsp
- @[ -d $(@D) ] || mkdir -p $(@D)
-- $(FAUST) -lang $(lang) -I $(FAUSTLIBS) $(FAUSTOPTIONS) $< -o $@
-+ $(FAUST) -lang $(lang) -I $(FAUSTLIBS1) -I $(FAUSTLIBS2) $(FAUSTOPTIONS) $< -o $@
--
GitLab