Update dpf, set categories, allow system carla, remove vst3 midifx

Makefile

@@ -20,6 +20,10 @@ DESTDIR ?=
 # --------------------------------------------------------------
 # Carla config
 
+ifeq ($(WASM),true)
+USE_SYSTEM_CARLA_BINS = true
+endif
+
 CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Ildaeil \
 	CAN_GENERATE_LV2_TTL=false \
 	STATIC_PLUGIN_TARGET=true \
@@ -35,7 +39,7 @@ endif
 
 CARLA_TARGETS = static-plugin
 
-ifneq ($(WASM),true)
+ifneq ($(USE_SYSTEM_CARLA_BINS),true)
 CARLA_TARGETS += bridges-plugin bridges-ui
 endif
 

carla

@@ -1 +1 @@
-Subproject commit c6f49f6da367306f0c02e49dcfd6fba2d7c93551
+Subproject commit 8c58d0994cd512263e34db1c8f45c1f1a9689a58

dpf

@@ -1 +1 @@
-Subproject commit 3df2b31e681b43f5baeca7ed37f161d0ad9845de
+Subproject commit f049ce37805ed9aff64320aa8a4075b8223881a6

dpf-widgets

@@ -1 +1 @@
-Subproject commit f915ebc8991fdb977fe41ae312d4249ce3a6000b
+Subproject commit e609d5ea7d162ef4e7f01329d9c296cb0a42b08d

plugins/Common/Makefile.mk

@@ -61,6 +61,7 @@ EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 # --------------------------------------------------------------
 # Do some more magic
 
+USE_CLAP_BUNDLE = true
 USE_VST2_BUNDLE = true
 include ../../dpf/Makefile.plugins.mk
 
@@ -97,24 +98,34 @@ endif
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifneq ($(WASM),true)
-all: jack lv2 vst2 vst3 carlabins
+ifeq ($(WASM),true)
+TARGETS_EXTRA = jack
 else
-all: jack
+TARGETS_BASE = lv2 vst2 clap
+# VST3 does not do MIDI filter plugins, by design
+ifneq ($(NAME),Ildaeil-MIDI)
+TARGETS_BASE += vst3
+endif
+TARGETS_EXTRA = jack carlabins
 endif
 
+all: $(TARGETS_BASE) $(TARGETS_EXTRA)
+
 # --------------------------------------------------------------
 # special step for carla binaries
 
-ifneq ($(WASM),true)
+ifneq ($(USE_SYSTEM_CARLA_BINS),true)
 CARLA_BINARIES  = $(CURDIR)/../../carla/bin/carla-bridge-native$(APP_EXT)
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk2$(APP_EXT)
 CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk3$(APP_EXT)
 
-carlabins: lv2 vst2 vst3
+carlabins: $(TARGETS_BASE)
 	install -m 755 $(CARLA_BINARIES) $(shell dirname $(lv2))
 	install -m 755 $(CARLA_BINARIES) $(shell dirname $(vst2))
+	install -m 755 $(CARLA_BINARIES) $(shell dirname $(clap))
+ifneq ($(NAME),Ildaeil-MIDI)
 	install -m 755 $(CARLA_BINARIES) $(shell dirname $(vst3))
+endif
 else
 carlabins:
 endif

plugins/FX/DistrhoPluginInfo.h

@@ -1,6 +1,6 @@
 /*
  * DISTRHO Ildaeil Plugin
- * Copyright (C) 2021 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,9 +18,14 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
-#define DISTRHO_PLUGIN_BRAND "DISTRHO"
-#define DISTRHO_PLUGIN_NAME  "Ildaeil-FX"
-#define DISTRHO_PLUGIN_URI   "https://distrho.kx.studio/plugins/ildaeil#fx"
+#define DISTRHO_PLUGIN_BRAND   "DISTRHO"
+#define DISTRHO_PLUGIN_NAME    "Ildaeil-FX"
+#define DISTRHO_PLUGIN_URI     "https://distrho.kx.studio/plugins/ildaeil#fx"
+#define DISTRHO_PLUGIN_CLAP_ID "studio.kx.distrho.ildaeil#fx"
+
+#define DISTRHO_PLUGIN_CLAP_FEATURES   "audio-effect", "stereo"
+#define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:UtilityPlugin"
+#define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Stereo"
 
 #define DISTRHO_PLUGIN_HAS_UI             1
 #define DISTRHO_PLUGIN_IS_SYNTH           0

plugins/MIDI/DistrhoPluginInfo.h

@@ -1,6 +1,6 @@
 /*
  * DISTRHO Ildaeil Plugin
- * Copyright (C) 2021 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,9 +18,13 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
-#define DISTRHO_PLUGIN_BRAND "DISTRHO"
-#define DISTRHO_PLUGIN_NAME  "Ildaeil-MIDI"
-#define DISTRHO_PLUGIN_URI   "https://distrho.kx.studio/plugins/ildaeil#midi"
+#define DISTRHO_PLUGIN_BRAND   "DISTRHO"
+#define DISTRHO_PLUGIN_NAME    "Ildaeil-MIDI"
+#define DISTRHO_PLUGIN_URI     "https://distrho.kx.studio/plugins/ildaeil#midi"
+#define DISTRHO_PLUGIN_CLAP_ID "studio.kx.distrho.ildaeil#midi"
+
+#define DISTRHO_PLUGIN_CLAP_FEATURES "note-effect"
+#define DISTRHO_PLUGIN_LV2_CATEGORY  "lv2:MIDIPlugin"
 
 #define DISTRHO_PLUGIN_HAS_UI             1
 #define DISTRHO_PLUGIN_IS_SYNTH           0

plugins/Synth/DistrhoPluginInfo.h

@@ -1,6 +1,6 @@
 /*
  * DISTRHO Ildaeil Plugin
- * Copyright (C) 2021 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,9 +18,14 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
-#define DISTRHO_PLUGIN_BRAND "DISTRHO"
-#define DISTRHO_PLUGIN_NAME  "Ildaeil-Synth"
-#define DISTRHO_PLUGIN_URI   "https://distrho.kx.studio/plugins/ildaeil#synth"
+#define DISTRHO_PLUGIN_BRAND   "DISTRHO"
+#define DISTRHO_PLUGIN_NAME    "Ildaeil-Synth"
+#define DISTRHO_PLUGIN_URI     "https://distrho.kx.studio/plugins/ildaeil#synth"
+#define DISTRHO_PLUGIN_CLAP_ID "studio.kx.distrho.ildaeil#synth"
+
+#define DISTRHO_PLUGIN_CLAP_FEATURES   "instrument", "stereo"
+#define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:InstrumentPlugin"
+#define DISTRHO_PLUGIN_VST3_CATEGORIES "Instrument|Stereo"
 
 #define DISTRHO_PLUGIN_HAS_UI             1
 #define DISTRHO_PLUGIN_IS_SYNTH           1