From 16bbc1c37568b1c53a30d7c7e13438841718127d Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 30 Dec 2023 23:55:58 +0100 Subject: [PATCH] Add juce plugins Signed-off-by: falkTX --- .github/workflows/build.yml | 10 +++++----- Makefile | 2 ++ src/PawPaw | 2 +- src/mod-plugin-builder | 2 +- utils/plugin-builder/plugin-builder.sh | 2 +- utils/plugin-builder/validate-plugins.sh | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de28ab6..f826759 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,9 +3,9 @@ name: build on: [push, pull_request] env: - CACHE_VERSION_LINUX: 11 - CACHE_VERSION_MACOS: 11 - CACHE_VERSION_WIN64: 11 + CACHE_VERSION_LINUX: 13 + CACHE_VERSION_MACOS: 13 + CACHE_VERSION_WIN64: 13 DEBIAN_FRONTEND: noninteractive PAWPAW_SKIP_LTO: 1 PAWPAW_SKIP_TESTS: 1 @@ -53,7 +53,7 @@ jobs: - name: Set up dependencies run: | ./src/PawPaw/.github/workflows/bootstrap-deps.sh linux-x86_64 - apt-get install -yqq p7zip-full unzip wget xdg-user-dirs zip + apt-get install -yqq libfreetype6-dev p7zip-full unzip wget xdg-user-dirs zip - name: Set up cache id: cache uses: actions/cache@v3 @@ -183,7 +183,7 @@ jobs: - name: Set up dependencies run: | ./src/PawPaw/.github/workflows/bootstrap-deps.sh win64 - apt-get install -yqq p7zip-full unzip wget xdg-user-dirs xvfb zip + apt-get install -yqq libfreetype6-dev libx11-dev libxrandr-dev p7zip-full unzip wget xdg-user-dirs xvfb zip - name: Set up cache id: cache uses: actions/cache@v3 diff --git a/Makefile b/Makefile index bb04c40..f59f8e1 100644 --- a/Makefile +++ b/Makefile @@ -170,6 +170,7 @@ PLUGINS += artyfx PLUGINS += bolliedelay PLUGINS += caps-lv2 PLUGINS += carla-plugins +PLUGINS += chow-centaur PLUGINS += die-plugins PLUGINS += dpf-plugins PLUGINS += dragonfly-reverb @@ -191,6 +192,7 @@ PLUGINS += neuralrecord PLUGINS += neural-amp-modeler-lv2 PLUGINS += notes-lv2 PLUGINS += pitchtracking-series +PLUGINS += schrammel-ojd # crashing linux https://github.com/moddevices/mod-app/actions/runs/6718888228/job/18259448918 # crashing macos https://github.com/moddevices/mod-app/actions/runs/6718888228/job/18259448741 # PLUGINS += screcord diff --git a/src/PawPaw b/src/PawPaw index 0c1f901..5cbfd31 160000 --- a/src/PawPaw +++ b/src/PawPaw @@ -1 +1 @@ -Subproject commit 0c1f901c3860b165d8c6b53bd4e0db37c09679a4 +Subproject commit 5cbfd318ab11dd44f04333f6d7e3bf5005d61c1a diff --git a/src/mod-plugin-builder b/src/mod-plugin-builder index 91d7ad4..fde5d48 160000 --- a/src/mod-plugin-builder +++ b/src/mod-plugin-builder @@ -1 +1 @@ -Subproject commit 91d7ad4c5f5b50efe1b5d238bd0a8f4deba398eb +Subproject commit fde5d489458633b82b200b486f20e3912957d87f diff --git a/utils/plugin-builder/plugin-builder.sh b/utils/plugin-builder/plugin-builder.sh index d16a5fe..7056d10 100755 --- a/utils/plugin-builder/plugin-builder.sh +++ b/utils/plugin-builder/plugin-builder.sh @@ -30,7 +30,7 @@ source src/PawPaw/local.env "${target}" # --------------------------------------------------------------------------------------------------------------------- export CFLAGS+="-D__MOD_DEVICES__ -D_MOD_DESKTOP" -export CXXFLAGS+="-D__MOD_DEVICES__ -D_MOD_DESKTOP" +export CXXFLAGS+="-D__MOD_DEVICES__ -D_MOD_DESKTOP -DJUCE_AUDIOPROCESSOR_NO_GUI=1" export CMAKE export PAWPAW_BUILDDIR diff --git a/utils/plugin-builder/validate-plugins.sh b/utils/plugin-builder/validate-plugins.sh index 9b40658..1e6620d 100755 --- a/utils/plugin-builder/validate-plugins.sh +++ b/utils/plugin-builder/validate-plugins.sh @@ -15,7 +15,7 @@ function convert_path() { } if [ -e mod-ui.exe ]; then - source ../PawPaw/local.env win64 + source ../src/PawPaw/local.env win64 DOCS_DIR=$(xdg-user-dir DOCUMENTS) LV2_PATH="$(convert_path $(pwd)/plugins)" OS_SEP="\\" @@ -29,7 +29,7 @@ elif [ -e mod-app.app ]; then LV2_PATH="$(pwd)/mod-app.app/Contents/PlugIns/LV2" OS_SEP='/' else - source ../PawPaw/local.env linux + source ../src/PawPaw/local.env linux DOCS_DIR=$(xdg-user-dir DOCUMENTS) LV2_PATH="$(pwd)/plugins" OS_SEP='/' @@ -49,7 +49,7 @@ mkdir -p "${DOCS_DIR}/MOD App/keys" mkdir -p "${DOCS_DIR}/MOD App/user-files/Audio Recordings" if [ -z "${EXE_WRAPPER}" ] && [ -n "${VALGRIND}" ] && [ "${VALGRIND}" -eq 1 ]; then - EXE_WRAPPER="valgrind --leak-check=full --track-origins=yes --keep-debuginfo=yes --suppressions=../mod-plugin-builder/plugins-dep/valgrind-libdl.supp" + EXE_WRAPPER="valgrind --leak-check=full --track-origins=yes --keep-debuginfo=yes --suppressions=../src/mod-plugin-builder/plugins-dep/valgrind-libdl.supp" fi PLUGINS=($(${EXE_WRAPPER} "${PAWPAW_PREFIX}/lib/carla/carla-discovery-native${APP_EXT}" lv2 ":all" 2>/dev/null | tr -dC '[:print:]\n' | awk 'sub("carla-discovery::label::","")'))