Merge branch 'fixes' into faust2clap-joss

Author: cucuwritescode

.github/workflows/libfaust.yml

@@ -1,8 +1,8 @@
 name: libfaust
 
 env:
-  FAUST_VERSION: 2.81.6
-  FAUSTGEN_VERSION: "1.78"   
+  FAUST_VERSION: 2.82.0
+  FAUSTGEN_VERSION: "1.79"   
   LLVM_PACKAGE_VERSION: "18.1.8"
   CMAKE_OSX_DEPLOYMENT_TARGET: "10.15"
   LLVM_COMMIT: 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a

.gitmodules

@@ -25,3 +25,6 @@
 [submodule "external/clap-sdk"]
 	path = external/clap-sdk
 	url = https://github.com/free-audio/clap.git
+[submodule "external/efsw"]
+	path = external/efsw
+	url = https://github.com/SpartanJ/efsw

COPYING.txt

@@ -1,4 +1,4 @@
-    FAUST compiler, Version 2.81.6
+    FAUST compiler, Version 2.82.0
     Copyright (C) 2003-2024 GRAME, Centre National de Creation Musicale
     Copyright (C) 2023-2024 INRIA
     ---------------------------------------------------------------------

Makefile

@@ -1,4 +1,4 @@
-version := 2.81.6
+version := 2.82.0
 
 system	?= $(shell uname -s)
 

architecture/ca-qt.cpp

@@ -47,7 +47,9 @@
 #include "faust/gui/JSONUI.h"
 #include "faust/gui/PresetUI.h"
 #include "faust/gui/QTUI.h"
+#ifdef MCP
 #include "faust/gui/McpUI.h"
+#endif
 #include "faust/misc.h"
 
 #ifdef IOS
@@ -257,8 +259,9 @@ int main(int argc, char* argv[])
     bool  midi      = false;
     int   nvoices   = 0;
     bool  control   = true;
-    bool  mcp       = isopt(argv, "--mcp");
-
+#ifdef MCP
+    bool mcp = isopt(argv, "--mcp");
+#endif
     if (isopt(argv, "-help") || isopt(argv, "-h")) {
         cout << argv[0]
              << " [--sample-rate <val>] [--buffer <val>] [--nvoices <val>] [--control <0/1>] "
@@ -347,6 +350,7 @@ int main(int argc, char* argv[])
     QTGUI* interface = new QTGUI();
     FUI    finterface;
 
+#ifdef MCP
     // MCP operations
     McpUI       myMcpUI;
     std::thread mcpThread;
@@ -355,7 +359,7 @@ int main(int argc, char* argv[])
         DSP->buildUserInterface(&myMcpUI);
         mcpThread = std::thread([&myMcpUI]() { myMcpUI.run(); });
     }
-
+#endif
 #ifdef PRESETUI
     PresetUI pinterface(interface,
                         string(PRESETDIR) + string(name) + ((nvoices > 0) ? "_poly" : ""));
@@ -405,12 +409,17 @@ int main(int argc, char* argv[])
     DSP->buildUserInterface(&oscinterface);
     cout << "OSC is on" << endl;
 #endif
+#ifdef MCP
     if (!mcp) {
         // If MCP we don't want a non protocol message to be sent
         cout << "ins " << audio.getNumInputs() << endl;
         cout << "outs " << audio.getNumOutputs() << endl;
     }
+#else
+    cout << "ins " << audio.getNumInputs() << endl;
+    cout << "outs " << audio.getNumOutputs() << endl;
 
+#endif
 #ifdef HTTPCTRL
     httpdinterface.run();
 #ifdef QRCODECTRL
@@ -448,12 +457,12 @@ int main(int argc, char* argv[])
 
     audio.stop();
     finterface.saveState(rcfilename);
-
+#ifdef MCP
     // Forcer la terminaison du thread MCP si actif
     if (mcp && mcpThread.joinable()) {
         mcpThread.detach();
     }
-
+#endif
     delete DSP;
     return 0;
 }

architecture/clap/Makefile.simple

@@ -13,75 +13,95 @@
 #   - CLAP SDK and helpers in ../../external/
 #   - C++17 compatible compiler
 
-CXX = g++
-CXXFLAGS = -std=c++17 -fPIC -O2 -Wall -Wextra
-INCLUDES = -I../../architecture \
-           -I../../external/clap-sdk/include \
-           -I../../external/clap-helpers/include \
-           -I/usr/local/include \
-           -I/opt/homebrew/include \
-           -Iefsw/include \
-           -Iefsw/src
-
-LIBS = -L/usr/local/lib -L/opt/homebrew/lib -lfaust -ldl -framework CoreServices -framework CoreFoundation
-
-TARGET = FaustDynamic.clap
-SOURCE = simple-faust.cpp
-HELPER_OBJS = clap-helpers-impl.o interpreter-clap.o
-MAIN_OBJ = faust-dynamic.o
-EFSW_LIB = efsw/build/libefsw-static.a
+CXX := /usr/bin/clang++
+CXXFLAGS := -std=c++17 -fPIC -O2 -Wall -Wextra -fvisibility=default
+
+# Detect whether we're inside an installed faust2clap tree or building in-repo
+SCRIPT_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
+TOP_DIR := $(abspath $(SCRIPT_DIR)/../..)
+
+# Allow override via env, useful for installed tree
+FAUST2CLAP_ROOT ?= $(TOP_DIR)
+
+# External dependencies
+CLAP_SDK_INC := $(FAUST2CLAP_ROOT)/external/clap-sdk/include
+CLAP_HELPERS_INC := $(FAUST2CLAP_ROOT)/external/clap-helpers/include
+EFSW_INC := $(FAUST2CLAP_ROOT)/external/efsw/include
+EFSW_SRC := $(FAUST2CLAP_ROOT)/external/efsw/src
+EFSW_LIB := $(FAUST2CLAP_ROOT)/external/efsw/build/libefsw-static.a
+
+INCLUDES = \
+  -I$(FAUST2CLAP_ROOT)/architecture \
+  -I$(FAUST2CLAP_ROOT)/external/clap-sdk/include \
+  -I$(FAUST2CLAP_ROOT)/external/clap-helpers/include \
+  -I$(FAUST2CLAP_ROOT)/external/efsw/include \
+  -I$(FAUST2CLAP_ROOT)/external/efsw/src \
+  -I/usr/local/include \
+  -I/opt/homebrew/include
+
+LIBS := -L$(FAUST2CLAP_ROOT)/external/efsw/build \
+        -lfaust -ldl \
+        -framework CoreServices -framework CoreFoundation
+
+# Output target
+TARGET := FaustDynamic.clap
+
+# Source files
+SOURCE := simple-faust.cpp
+MAIN_OBJ := faust-dynamic.o
+HELPER_OBJS := clap-helpers-impl.o interpreter-clap.o
 
 all: $(TARGET)
 
 $(TARGET): $(MAIN_OBJ) $(HELPER_OBJS) $(EFSW_LIB)
 	@echo "🔗 Linking $(TARGET)..."
-	$(CXX) -shared $(MAIN_OBJ) $(HELPER_OBJS) $(EFSW_LIB) $(LIBS) -o $@
+	$(CXX) -bundle -undefined dynamic_lookup \
+		$(MAIN_OBJ) $(HELPER_OBJS) $(EFSW_LIB) $(LIBS) \
+		-Wl,-headerpad_max_install_names \
+		-Wl,-exported_symbol,_clap_entry \
+		-Wl,-rpath,/usr/local/lib \
+		-o $@
 	@echo "✅ Built $(TARGET) successfully"
 
 $(MAIN_OBJ): $(SOURCE)
 	@echo "🔨 Compiling main plugin source..."
-	$(CXX) $(CXXFLAGS) $(INCLUDES) -c $(SOURCE) -o $@
+	$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
 
 clap-helpers-impl.o: clap-helpers-impl.cpp
 	@echo "🔨 Compiling CLAP helpers..."
-	$(CXX) $(CXXFLAGS) $(INCLUDES) -c clap-helpers-impl.cpp -o $@
+	$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
 
 interpreter-clap.o: interpreter-clap.cpp interpreter-clap.h
 	@echo "🔨 Compiling Faust interpreter interface..."
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -c interpreter-clap.cpp -o $@
 
+
+# Build efsw automatically if missing
+ifeq ("$(wildcard $(EFSW_LIB))","")
+$(info ⚠️ efsw not built yet – will build it now)
+NEED_EFSW := 1
+endif
+
+
 $(EFSW_LIB):
-	@echo "🔨 Building efsw library..."
-	@cd efsw && mkdir -p build && cd build && cmake .. && make efsw-static
+	@echo "🔨 Building efsw..."
+	cd $(FAUST2CLAP_ROOT)/external/efsw && \
+		mkdir -p build && \
+		cd build && \
+		cmake .. && \
+		make efsw-static
+
+install: $(TARGET)
+	@echo "📦 Installing $(TARGET)..."
+	mkdir -p $(HOME)/Library/Audio/Plug-Ins/CLAP/
+	mkdir -p $(HOME)/.clap/plugins/
+	cp -f $(TARGET) $(HOME)/Library/Audio/Plug-Ins/CLAP/
+	cp -f $(TARGET) $(HOME)/.clap/plugins/
+	@echo "✅ Plugin installed to user plugin directories"
 
 clean:
 	@echo "🧹 Cleaning build artifacts..."
-	rm -f $(MAIN_OBJ) $(HELPER_OBJS) $(TARGET)
+	rm -f *.o $(TARGET)
 	@echo "✅ Clean complete"
 
-install: $(TARGET)
-	@echo "📦 Installing $(TARGET)..."
-	@mkdir -p $(HOME)/Library/Audio/Plug-Ins/CLAP/
-	@mkdir -p $(HOME)/.clap/plugins/
-	cp $(TARGET) $(HOME)/Library/Audio/Plug-Ins/CLAP/
-	cp $(TARGET) $(HOME)/.clap/plugins/
-	@echo "✅ Installed $(TARGET) to system plugin directories"
-
-# Development targets
-test: $(TARGET)
-	@echo "🧪 Testing plugin load..."
-	@if [ -n "$(CLAP_VALIDATOR)" ]; then \
-		$(CLAP_VALIDATOR) $(TARGET); \
-	else \
-		echo "⚠️  CLAP_VALIDATOR not set, skipping validation"; \
-	fi
-
-# Show build info
-info:
-	@echo "🛠️  Faust Dynamic CLAP Plugin Build Configuration:"
-	@echo "   Compiler: $(CXX)"
-	@echo "   Flags: $(CXXFLAGS)"
-	@echo "   Target: $(TARGET)"
-	@echo "   Dependencies: libfaust (with interpreter), CLAP SDK"
-
-.PHONY: all clean install test info
+.PHONY: all install clean

architecture/clap/faust_gui_glue.cpp

@@ -0,0 +1,9 @@
+//
+// Created by Facundo Franchino on 18/06/2025.
+//
+
+#include <faust/gui/GUI.h>
+
+ztimedmap GUI::gTimedZoneMap;
+std::list<GUI*> GUI::fGuiList;
+

architecture/clap/gui_stuff/grame.icns

@@ -0,0 +1,31 @@
+//modified by Facundo Franchino
+//explicit template instantiations for clap::helpers::Plugin and HostProxy
+
+#include <clap/helpers/host-proxy.hxx>
+#include <clap/helpers/param-queue.hh>
+#include <clap/helpers/plugin.hh>
+#include <clap/helpers/plugin.hxx>
+#include <clap/helpers/reducing-param-queue.hh>
+#include <clap/helpers/reducing-param-queue.hxx>
+
+//instantiate combinations of Plugin<MisbehaviourHandler, CheckingLevel>
+
+template class clap::helpers::Plugin<clap::helpers::MisbehaviourHandler::Terminate,
+                                     clap::helpers::CheckingLevel::Maximal>;
+template class clap::helpers::Plugin<clap::helpers::MisbehaviourHandler::Terminate,
+                                     clap::helpers::CheckingLevel::Minimal>;
+template class clap::helpers::Plugin<clap::helpers::MisbehaviourHandler::Terminate,
+                                     clap::helpers::CheckingLevel::None>;
+template class clap::helpers::Plugin<clap::helpers::MisbehaviourHandler::Ignore,
+                                     clap::helpers::CheckingLevel::Maximal>;
+
+//instantiate combinations of HostProxy<MisbehaviourHandler, CheckingLevel>
+
+template class clap::helpers::HostProxy<clap::helpers::MisbehaviourHandler::Terminate,
+                                        clap::helpers::CheckingLevel::Maximal>;
+template class clap::helpers::HostProxy<clap::helpers::MisbehaviourHandler::Terminate,
+                                        clap::helpers::CheckingLevel::Minimal>;
+template class clap::helpers::HostProxy<clap::helpers::MisbehaviourHandler::Terminate,
+                                        clap::helpers::CheckingLevel::None>;
+template class clap::helpers::HostProxy<clap::helpers::MisbehaviourHandler::Ignore,
+                                        clap::helpers::CheckingLevel::Maximal>;

architecture/clap/plugin.cc

@@ -319,12 +319,12 @@ extern "C" LIBFAUST_API void stopMTDSPFactories();
  * the same (reference counted) factory pointer. You will have to explicitly use deleteInterpreterDSPFactory to properly
  * decrement reference counter when the factory is no more needed.
  *
- * @param bitcode - the bitcode string
+ * @param bit_code - the bitcode string
  * @param error_msg - the error string to be filled
  *
  * @return the DSP factory on success, otherwise a null pointer.
  */
-LIBFAUST_API interpreter_dsp_factory* readInterpreterDSPFactoryFromBitcode(const std::string& bitcode, std::string& error_msg);
+LIBFAUST_API interpreter_dsp_factory* readInterpreterDSPFactoryFromBitcode(const std::string& bit_code, std::string& error_msg);
 
 /**
  * Write a Faust DSP factory into a bitcode string.