From 9fa3461aff8d1a21bafb698f0d146daf2512e4ec Mon Sep 17 00:00:00 2001
From: David Braun <2096055+DBraun@users.noreply.github.com>
Date: Sat, 7 Sep 2024 19:17:13 -0400
Subject: [PATCH] use previous libfaust 2.69.3

---
 .github/workflows/all.yml                | 21 +++++++--------------
 test-requirements.txt                    |  4 ++--
 tests/test_libfaust_box.py               |  6 ++++--
 thirdparty/faust                         |  2 +-
 thirdparty/libfaust/download_libfaust.py |  4 +---
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index e53e008e..7c85f456 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -11,7 +11,7 @@ jobs:
   build-ubuntu:
     runs-on: ubuntu-22.04
     strategy:
-      # fail-fast: false
+      fail-fast: false
       matrix:
         include:
         # - { python-version: "3.8", pythonLibPath: "/opt/python/cp39-cp38/lib", pythonInclude: "/opt/python/cp38-cp38/include/python3.8", cibwbuild: "cp38-manylinux_x86_64"}
@@ -29,19 +29,12 @@ jobs:
       with:
         submodules: true
 
-    # - name: Set up QEMU for aarch64 on Linux
-    #   if: endsWith(${{matrix.cibwbuild}}, "aarch64")
-    #   uses: docker/setup-qemu-action@v3
-    #   with:
-    #     platforms: all
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y zstd libncurses-dev libxml2-dev
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get install -y libllvm15 llvm-15 llvm-15-dev
+    - name: Set up QEMU for aarch64 on Linux
+      # if: endsWith(${{matrix.cibwbuild}}, "aarch64")
+      if: runner.os == 'Linux'
+      uses: docker/setup-qemu-action@v3
+      with:
+        platforms: all
 
     - name: clean faust libraries
       run: |
diff --git a/test-requirements.txt b/test-requirements.txt
index e20a1b4e..5c487db7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
 librosa>=0.8.1
-numpy==1.26.*
+numpy>=1.21.2
 pytest>=6.2.4
 scipy>=1.7.0
-requests>=2.26.0
\ No newline at end of file
+requests>=2.26.0
diff --git a/tests/test_libfaust_box.py b/tests/test_libfaust_box.py
index 996d2ae9..06500001 100644
--- a/tests/test_libfaust_box.py
+++ b/tests/test_libfaust_box.py
@@ -620,7 +620,8 @@ def test_bus(n):
     test_bus(2)
 
 @pytest.mark.parametrize("backend",
-    ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
+    ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'java', 'jax', 'jsfx', 'julia', 'rust', 'wasm', 'wast']
+    # ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
     )
 def test25a(backend):
 
@@ -641,7 +642,8 @@ def test25a(backend):
 
 
 @pytest.mark.parametrize("backend",
-    ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
+    ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'java', 'jax', 'jsfx', 'julia', 'rust', 'wasm', 'wast']
+    # ['c', 'cpp', 'cmajor', 'codebox', 'csharp', 'dlang', 'fir', 'interp', 'java', 'jax', 'jsfx', 'julia', 'llvm', 'rust', 'wast']
     )
 def test26a(backend):
 
diff --git a/thirdparty/faust b/thirdparty/faust
index c4ad7d26..5341a623 160000
--- a/thirdparty/faust
+++ b/thirdparty/faust
@@ -1 +1 @@
-Subproject commit c4ad7d26481ee273e0cb3da3eb708300d58a0d74
+Subproject commit 5341a623b04420089318e967153eaf7bef49aa5c
diff --git a/thirdparty/libfaust/download_libfaust.py b/thirdparty/libfaust/download_libfaust.py
index 480e2681..4415ace2 100644
--- a/thirdparty/libfaust/download_libfaust.py
+++ b/thirdparty/libfaust/download_libfaust.py
@@ -22,8 +22,6 @@ def install_windows(version: str) -> None:
     if download_file(f"https://github.com/grame-cncm/faust/releases/download/{version}/{exe_file}", exe_file):
         cwd = str(Path(__file__).parent)
         subprocess.run([exe_file, "/S", f"/D={cwd}\\win64\\Release"], check=True)
-    libfaustwithllvm = f"{Path(__file__).parent}/win64/Release/lib/libfaustwithllvm.lib"
-    assert os.path.isfile(libfaustwithllvm), f"Missing file: {libfaustwithllvm}"
 
 def install_macos(version: str) -> None:
     for arch in ["arm64", "x64"]:
@@ -60,7 +58,7 @@ def main(version: str) -> None:
         sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON)
 
     parser = argparse.ArgumentParser(description="Download and install Libfaust.")
-    parser.add_argument("-v", "--version", default="2.74.6", help="Specify the version of Faust to download.")
+    parser.add_argument("-v", "--version", default="2.69.3", help="Specify the version of Faust to download.")
     parser.add_argument("--force", action="store_true", help="Force download even if files already exist.")
     args = parser.parse_args()