From 1743e4892ba2eb2c52de29d6255b6003baec3b2f Mon Sep 17 00:00:00 2001 From: David Braun <2096055+DBraun@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:47:59 -0400 Subject: [PATCH 1/3] upgrade libfaust to 2.68.1 --- .github/workflows/all.yml | 11 ++++++----- Plugins/faustlibraries | 2 +- README.md | 5 +++-- thirdparty/faust | 2 +- thirdparty/libfaust/download_libfaust.bat | 2 +- thirdparty/libfaust/download_libfaust.sh | 2 +- thirdparty/libsndfile | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 01b0705..e26122d 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -15,8 +15,9 @@ jobs: matrix: include: - { os: "windows-2022", python-version: "3.9", python-major: "39"} + - { os: "windows-2022", python-version: "3.11", python-major: "311"} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true @@ -54,7 +55,7 @@ jobs: 7z a TD-Faust-${{ matrix.os }}.zip ./TD-Faust_dist/* -r - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: TD-Faust-${{ matrix.os }}-Python${{ matrix.python-major }} path: TD-Faust-${{ matrix.os }}.zip @@ -68,7 +69,7 @@ jobs: # runs-on: macos-latest # steps: - # - uses: actions/checkout@v2 + # - uses: actions/checkout@v3 # with: # submodules: true @@ -96,7 +97,7 @@ jobs: # zip -r TD-Faust-${{ matrix.name }}.zip Plugins # - name: Upload artifact - # uses: actions/upload-artifact@v2 + # uses: actions/upload-artifact@v3 # with: # name: my-artifact-${{ matrix.name }} # path: TD-Faust-${{ matrix.name }}.zip @@ -108,7 +109,7 @@ jobs: runs-on: ubuntu-latest name: "Create Release on GitHub" steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: path: "dist" diff --git a/Plugins/faustlibraries b/Plugins/faustlibraries index 7a42e2f..302931c 160000 --- a/Plugins/faustlibraries +++ b/Plugins/faustlibraries @@ -1 +1 @@ -Subproject commit 7a42e2fc8be9541c40c5b7d0e2a946a14cdb83b9 +Subproject commit 302931c7abd0e28f5e77076456b7c38718c86d26 diff --git a/README.md b/README.md index 3bf7f96..98f0730 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # TD-Faust + TD-Faust is an integration of [FAUST](https://faust.grame.fr) (**F**unctional **AU**dio **ST**ream) and [TouchDesigner](https://derivative.ca/). The latest builds are for TouchDesigner 2022.25370 and newer. Older TD-Faust builds can be found in the [Releases](https://github.com/DBraun/TD-Faust/releases). ## Overview @@ -49,9 +50,9 @@ TD-Faust is designed for macOS version 11.0 and later. Also, macOS users need to 1. Clone this repository with git. Then update all submodules in the root of the repository with `git submodule update --init --recursive` 2. Install Xcode. 3. [Install CMake](https://cmake.org/download/) and confirm that it's installed by running `cmake --version` in Terminal. -4. Install [Python 3.9 universal2](https://www.python.org/downloads/release/python-3910/) and confirm it's in your system PATH. +4. Install [Python 3.9 universal2](https://www.python.org/downloads/release/python-3910/). Confirm it's in your system PATH (`where python3` in Terminal should indicate `/Library/Frameworks/Python.framework/Versions/3.11/bin/python3`). 5. Install requirements with [brew](http://brew.sh/): `brew install autoconf autogen automake flac libogg libtool libvorbis opus mpg123 pkg-config` -6. In a Terminal window, navigate to `thirdparty/libsndfile` and run `sh download_libfaust.sh`. +6. In a Terminal window, navigate to `thirdparty/libfaust` and run `sh download_libfaust.sh`. 7. In a Terminal window, navigate to the root of this repository and run `sh build_macos.sh`. 8. Open `TD-Faust.toe` diff --git a/thirdparty/faust b/thirdparty/faust index ad3e816..349a8e6 160000 --- a/thirdparty/faust +++ b/thirdparty/faust @@ -1 +1 @@ -Subproject commit ad3e816d25bd28106f6301b89ab5bc80cef46ce9 +Subproject commit 349a8e660e3efba8493383d1142cd4af2005d2f6 diff --git a/thirdparty/libfaust/download_libfaust.bat b/thirdparty/libfaust/download_libfaust.bat index 1c202fc..089ef5e 100644 --- a/thirdparty/libfaust/download_libfaust.bat +++ b/thirdparty/libfaust/download_libfaust.bat @@ -1,3 +1,3 @@ -set VERSION=2.60.3 +set VERSION=2.68.1 curl -L https://github.com/grame-cncm/faust/releases/download/%VERSION%/Faust-%VERSION%-win64.exe -o Faust-%VERSION%-win64.exe call Faust-%VERSION%-win64.exe /S /D=%cd%\win64\Release \ No newline at end of file diff --git a/thirdparty/libfaust/download_libfaust.sh b/thirdparty/libfaust/download_libfaust.sh index 162e90b..cf8c59a 100644 --- a/thirdparty/libfaust/download_libfaust.sh +++ b/thirdparty/libfaust/download_libfaust.sh @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=2.60.3 +VERSION=2.68.1 if [ "$(uname)" = "Darwin" ]; then echo "You are running macOS" diff --git a/thirdparty/libsndfile b/thirdparty/libsndfile index 1572011..e486f20 160000 --- a/thirdparty/libsndfile +++ b/thirdparty/libsndfile @@ -1 +1 @@ -Subproject commit 15720118146f8a60c25e53000db7d31bc06f2194 +Subproject commit e486f20fd4b1c7490cde84f22635e1c267ae882b From e1a66fbf731986adf6d54e2dfa9f8813d574f8e0 Mon Sep 17 00:00:00 2001 From: David Braun <2096055+DBraun@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:09:46 -0400 Subject: [PATCH 2/3] fix macos build issue with sndfile --- CMakeLists.txt | 3 ++- build_macos.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e0d95f..cbc4bac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR) -set(VERSION 0.4.1) +set(VERSION 0.4.2) project(TD-Faust VERSION ${VERSION}) set(SndFile_DIR ${SndFile_DIR}) @@ -72,6 +72,7 @@ if (MSVC) find_package(SndFile REQUIRED HINTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libsndfile-1.2.0-win64/cmake") target_link_libraries(${PROJECT_NAME} PRIVATE SndFile::sndfile) else() + list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libsndfile/install") find_package(PkgConfig REQUIRED) # We expect the user to have used brew to install the dependencies # for libsndfile, to have built libsndfile as a static lib, diff --git a/build_macos.sh b/build_macos.sh index 622ebf2..fdd95ef 100644 --- a/build_macos.sh +++ b/build_macos.sh @@ -28,7 +28,7 @@ cmake --build build --target install cd ../.. # Use CMake for TD-Faust -cmake -Bbuild -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=$CMAKE_OSX_DEPLOYMENT_TARGET -DLIBFAUST_DIR="$LIBFAUST_DIR" -DSndFile_DIR="thirdparty/libsndfile/install" -DPYTHONVER=$PYTHONVER +cmake -Bbuild -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=$CMAKE_OSX_DEPLOYMENT_TARGET -DLIBFAUST_DIR="$LIBFAUST_DIR" -DPYTHONVER=$PYTHONVER # Build TD-Faust (Release) xcodebuild -configuration Release -project build/TD-Faust.xcodeproj From a898f3c74e1e0793f615d70b00ed9878bb210e8d Mon Sep 17 00:00:00 2001 From: David Braun <2096055+DBraun@users.noreply.github.com> Date: Fri, 3 Nov 2023 17:21:48 -0400 Subject: [PATCH 3/3] Update all.yml --- .github/workflows/all.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index e26122d..83d558e 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: include: - - { os: "windows-2022", python-version: "3.9", python-major: "39"} - - { os: "windows-2022", python-version: "3.11", python-major: "311"} + - { name: "win64", os: "windows-2022", python-version: "3.9", python-major: "39"} + - { name: "win64", os: "windows-2022", python-version: "3.11", python-major: "311"} steps: - uses: actions/checkout@v3 with: @@ -47,18 +47,18 @@ jobs: - name: Make distribution run: | - mkdir TD-Faust_dist - move ${{ github.workspace }}/Plugins/TD-Faust.dll TD-Faust_dist - move ${{ github.workspace }}/Plugins/sndfile.dll TD-Faust_dist - cp -v -r ${{ github.workspace }}/Plugins/faustlibraries TD-Faust_dist - Remove-Item -Recurse -Force "TD-Faust_dist/faustlibraries/.git" - 7z a TD-Faust-${{ matrix.os }}.zip ./TD-Faust_dist/* -r + mkdir TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }} + move ${{ github.workspace }}/Plugins/TD-Faust.dll TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }} + move ${{ github.workspace }}/Plugins/sndfile.dll TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }} + cp -v -r ${{ github.workspace }}/Plugins/faustlibraries TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }} + Remove-Item -Recurse -Force "TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }}/faustlibraries/.git" + 7z a TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }}.zip ./TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }}/* -r - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: TD-Faust-${{ matrix.os }}-Python${{ matrix.python-major }} - path: TD-Faust-${{ matrix.os }}.zip + name: TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }} + path: TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }}.zip # build-macos: # strategy: @@ -94,13 +94,13 @@ jobs: # - name: Make distribution # run: | # rm -rf Plugins/faustlibraries/.git - # zip -r TD-Faust-${{ matrix.name }}.zip Plugins + # zip -r TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }}.zip Plugins # - name: Upload artifact # uses: actions/upload-artifact@v3 # with: - # name: my-artifact-${{ matrix.name }} - # path: TD-Faust-${{ matrix.name }}.zip + # name: TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }} + # path: TD-Faust-${{ matrix.name }}-Python${{ matrix.python-major }}.zip create-release: if: startsWith(github.ref, 'refs/tags/v')