From 31b5aa6de95a1807c64be6422a03eb7476936d85 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Tue, 19 May 2020 21:12:48 +0200 Subject: [PATCH] Fix VST problems in our forked submodules, branch sfizz --- .gitmodules | 4 ++-- .travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff | 12 ------------ .travis/script_mingw.sh | 2 -- vst/external/VST_SDK/VST3_SDK/pluginterfaces | 2 +- vst/external/VST_SDK/VST3_SDK/public.sdk | 2 +- 5 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 .travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff diff --git a/.gitmodules b/.gitmodules index 80382f51..1ed52774 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,11 +9,11 @@ shallow = true [submodule "vst/external/VST_SDK/VST3_SDK/pluginterfaces"] path = vst/external/VST_SDK/VST3_SDK/pluginterfaces - url = https://github.com/steinbergmedia/vst3_pluginterfaces.git + url = https://github.com/sfztools/vst3_pluginterfaces.git shallow = true [submodule "vst/external/VST_SDK/VST3_SDK/public.sdk"] path = vst/external/VST_SDK/VST3_SDK/public.sdk - url = https://github.com/steinbergmedia/vst3_public_sdk.git + url = https://github.com/sfztools/vst3_public_sdk.git shallow = true [submodule "vst/external/VST_SDK/VST3_SDK/vstgui4"] path = vst/external/VST_SDK/VST3_SDK/vstgui4 diff --git a/.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff b/.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff deleted file mode 100644 index 1425b31c..00000000 --- a/.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru VST_SDK.orig/VST3_SDK/pluginterfaces/base/funknown.cpp VST_SDK/VST3_SDK/pluginterfaces/base/funknown.cpp ---- VST_SDK.orig/VST3_SDK/pluginterfaces/base/funknown.cpp 2019-12-02 13:58:41.000000000 +0100 -+++ VST_SDK/VST3_SDK/pluginterfaces/base/funknown.cpp 2020-03-10 22:02:26.220911670 +0100 -@@ -84,7 +84,7 @@ - int32 PLUGIN_API atomicAdd (int32& var, int32 d) - { - #if SMTG_OS_WINDOWS -- return InterlockedExchangeAdd (&var, d) + d; -+ return InterlockedExchangeAdd ((LONG*)&var, d) + d; - #elif SMTG_OS_MACOS - #if SMTG_MACOS_USE_STDATOMIC - return atomic_fetch_add (reinterpret_cast (&var), d) + d; diff --git a/.travis/script_mingw.sh b/.travis/script_mingw.sh index 6ca765b6..2f1f545f 100755 --- a/.travis/script_mingw.sh +++ b/.travis/script_mingw.sh @@ -12,7 +12,6 @@ if [[ ${CROSS_COMPILE} == "mingw32" ]]; then -DSFIZZ_STATIC_LIBSNDFILE=ON \ -DCMAKE_CXX_STANDARD=17 \ .. - buildenv patch -p1 -i "$(pwd)"/../.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff -d ../vst/external/VST_SDK buildenv make -j$(nproc) elif [[ ${CROSS_COMPILE} == "mingw64" ]]; then buildenv x86_64-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release \ @@ -22,6 +21,5 @@ elif [[ ${CROSS_COMPILE} == "mingw64" ]]; then -DSFIZZ_STATIC_LIBSNDFILE=ON \ -DCMAKE_CXX_STANDARD=17 \ .. - buildenv patch -p1 -i "$(pwd)"/../.travis/patches/vstsdk-3.6.14-mingw-atomic-add.diff -d ../vst/external/VST_SDK buildenv make -j$(nproc) fi diff --git a/vst/external/VST_SDK/VST3_SDK/pluginterfaces b/vst/external/VST_SDK/VST3_SDK/pluginterfaces index 227ea1d8..8c07a58d 160000 --- a/vst/external/VST_SDK/VST3_SDK/pluginterfaces +++ b/vst/external/VST_SDK/VST3_SDK/pluginterfaces @@ -1 +1 @@ -Subproject commit 227ea1d8f749c6a66dd591582061d58682b4aa9f +Subproject commit 8c07a58d84c544a73e1ccad2efae200505796773 diff --git a/vst/external/VST_SDK/VST3_SDK/public.sdk b/vst/external/VST_SDK/VST3_SDK/public.sdk index c04e9bd6..ff836e8c 160000 --- a/vst/external/VST_SDK/VST3_SDK/public.sdk +++ b/vst/external/VST_SDK/VST3_SDK/public.sdk @@ -1 +1 @@ -Subproject commit c04e9bd690f50893742e2a082abab47af2c3efc8 +Subproject commit ff836e8c02bd28c902f5e3e75353a86f65008a77