From 04dacc0a400ba44136b60e6fdaa0de04323bf383 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Sat, 28 Nov 2020 23:35:43 +0100
Subject: [PATCH] Add a dependency for the VST3 pluginterfaces

---
 meson.build           | 20 +++++++++++++++++++-
 subprojects/vst3.wrap |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 1b881386..9cabf1bc 100644
--- a/meson.build
+++ b/meson.build
@@ -69,8 +69,26 @@ tomlplusplus_dep = subproject('tomlplusplus', version : '2.1.0').get_variable('t
 # The built in threads dependency does not know how to handle winegcc
 wine_threads_dep = declare_dependency(link_args : '-lpthread')
 xcb_dep = dependency('xcb')
+
 if with_vst3
-  vst3_pluginterfaces_dep = subproject('vst3', version : '3.7.1').get_variable('pluginterfaces_dep')
+  # Meson does not allow mixing native and non native dependencies from
+  # subprojects. The only workaround is to only define the necessary variables
+  # there, and to then assemble the dependencies here ourselves.
+  vst3 = subproject('vst3', version : '3.7.1')
+  vst3_compiler_options = vst3.get_variable('compiler_options')
+  vst3_include_dir = vst3.get_variable('include_dir')
+  vst3_pluginterfaces_native = static_library(
+    'pluginterfaces_native',
+    vst3.get_variable('pluginterfaces_sources'),
+    cpp_args : vst3_compiler_options,
+    include_directories : vst3_include_dir,
+    override_options : ['warning_level=0'],
+    native : true,
+  )
+  vst3_pluginterfaces_native_dep = declare_dependency(
+    link_with : vst3_pluginterfaces_native,
+    include_directories : vst3_include_dir,
+  )
 else
   message('VST3 support has been disabled')
 endif
diff --git a/subprojects/vst3.wrap b/subprojects/vst3.wrap
index aed03c6a..408cdb48 100644
--- a/subprojects/vst3.wrap
+++ b/subprojects/vst3.wrap
@@ -2,6 +2,6 @@
 url = https://github.com/robbert-vdh/vst3sdk.git
 # This is VST3 SDK v3.7.1_build_50 with the documentation and VSTGUI submodules
 # removed
-revision = 2a1a230d45766532360a2f432083f0795f2b0d93
+revision = 26374423ae275c01a774e6a1db44912090a66796
 clone-recursive = true
 depth = 1