Replace juce7 with submodule as well, update to 7.0.9

Signed-off-by: falkTX <falktx@falktx.com>

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "libs/juce6.1/source"]
 	path = libs/juce6.1/source
 	url = https://github.com/DISTRHO/JUCE.git
+[submodule "libs/juce7/source"]
+	path = libs/juce7/source
+	url = https://github.com/DISTRHO/JUCE.git

README.md

@@ -27,7 +27,7 @@ GNU/Linux: (development versions of these)
 In order to build and install the plugins, just run the usual steps for a meson project:
 
 ```
-meson build --buildtype release
+meson setup build --buildtype release
 ninja -C build
 ninja -C build install
 ```

libs/juce-plugin/JucePluginMain.cpp

@@ -19,23 +19,36 @@
 
 #if JucePlugin_Build_AU
  #include "modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm"
+
 #elif JucePlugin_Build_LV2
  #if JUCE_MAJOR_VERSION >= 7
-  #include "modules/juce_audio_plugin_client/LV2/juce_LV2_Client.cpp"
+  #include "modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp"
  #else
   #include "modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp"
  #endif
+
 #elif JucePlugin_Build_RTAS
  #include "modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp"
+
 #elif JucePlugin_Build_VST
  // we need to include 'juce_VSTMidiEventList' before 'juce_VST_Wrapper'
  namespace Vst2 {
  #include "modules/juce_audio_processors/format_types/juce_VSTInterface.h"
  }
  #include "modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h"
- #include "modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp"
+ #if JUCE_MAJOR_VERSION >= 7
+  #include "modules/juce_audio_plugin_client/juce_audio_plugin_client_VST2.cpp"
+ #else
+  #include "modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp"
+ #endif
+
 #elif JucePlugin_Build_VST3
- #include "modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp"
+ #if JUCE_MAJOR_VERSION >= 7
+  #include "modules/juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp"
+ #else
+  #include "modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp"
+ #endif
+
 #elif JucePlugin_Build_Standalone
  #include "juce_StandaloneFilterApplication.cpp"
 #else

libs/juce-plugin/JucePluginUtils.cpp

@@ -23,7 +23,7 @@
  #error Invalid configuration
 #endif
 
-#if ! JucePlugin_Build_Standalone
+#if ! JucePlugin_Build_Standalone && JUCE_MAJOR_VERSION < 7
  #include "modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp"
 #endif
 

libs/juce7/meson.build

@@ -35,9 +35,10 @@ juce7_devices_srcs = [
 ]
 
 juce7_extra_cpp_args = [
-    '-std=gnu++14',
+    '-std=gnu++17',
     '-Wno-non-virtual-dtor',
 ]
+juce7_extra_dependencies = []
 juce7_extra_include_dirs = []
 
 if os_windows
@@ -49,6 +50,9 @@ if os_windows
             '-mpreferred-stack-boundary=2',
         ]
     endif
+    juce7_extra_dependencies += [
+        cc.find_library('dxgi'),
+    ]
 endif
 
 lib_juce7 = static_library('juce7',
@@ -61,7 +65,7 @@ lib_juce7 = static_library('juce7',
         juce7_extra_include_dirs
     ],
     cpp_args: build_flags_cpp + juce7_extra_cpp_args,
-    dependencies: dependencies,
+    dependencies: dependencies + juce7_extra_dependencies,
     pic: true,
     install: false,
 )
@@ -75,7 +79,7 @@ lib_juce7_device = static_library('juce7-devices',
         juce7_extra_include_dirs
     ],
     cpp_args: build_flags_cpp + juce7_extra_cpp_args + ['-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1'],
-    dependencies: dependencies_devices,
+    dependencies: dependencies_devices + juce7_extra_dependencies,
     pic: true,
     install: false,
 )