cmake: fftw fixes following libossia, update multiple 3rdparty libs, fix an LV2 leak

Author: jcelerier

3rdparty/avendish

@@ -47,6 +47,7 @@ if(OSSIA_SDK)
       "${OSSIA_SDK}/sysroot/lib/cmake/zstd"
 
       "${OSSIA_SDK}/SDL2/lib64"
+      "${OSSIA_SDK}/SDL2/lib64/cmake/SDL2"
       "${OSSIA_SDK}/qt6-static-debug/lib64"
       "${OSSIA_SDK}/qt6-static/lib64"
       "${OSSIA_SDK}/llvm-libs/lib64"

3rdparty/libossia

@@ -175,29 +175,29 @@ if(IOS)
     )
 endif()
 
-find_path(FFTW3_INCLUDEDIR fftw3.h)
-if(FFTW3_INCLUDEDIR)
-  find_library(FFTW3_LIBRARY fftw3)
-  find_library(FFTW3_THREADS_LIBRARY fftw3_threads)
-  if(FFTW3_THREADS_LIBRARY)
-    set(FFTW3_HAS_THREADS 1)
-    target_include_directories(${APPNAME} PRIVATE ${FFTW3_INCLUDEDIR})
-    target_link_libraries(${APPNAME} PRIVATE ${FFTW3_THREADS_LIBRARY})
-  elseif(FFTW3_LIBRARY)
+find_path(FFTW_INCLUDE_DIR fftw3.h)
+if(FFTW_INCLUDE_DIR)
+  find_library(FFTW_LIBRARY fftw3)
+  find_library(FFTW_THREADS_LIBRARY fftw3_threads)
+  if(FFTW_THREADS_LIBRARY)
+    set(FFTW_HAS_THREADS 1)
+    target_include_directories(${APPNAME} PRIVATE ${FFTW_INCLUDE_DIR})
+    target_link_libraries(${APPNAME} PRIVATE ${FFTW_THREADS_LIBRARY})
+  elseif(FFTW_LIBRARY)
     if(MSVC)
-      set(FFTW3_HAS_THREADS 1)
+      set(FFTW_HAS_THREADS 1)
     else()
-      check_symbol_exists(fftw_make_planner_thread_safe ${FFTW3_LIBRARY} FFTW3_HAS_THREADS)
+      check_symbol_exists(fftw_make_planner_thread_safe ${FFTW_LIBRARY} FFTW_HAS_THREADS)
     endif()
 
-    if(FFTW3_HAS_THREADS)
-      target_include_directories(${APPNAME} PRIVATE ${FFTW3_INCLUDEDIR})
-      target_link_libraries(${APPNAME} PRIVATE ${FFTW3_LIBRARY})
+    if(FFTW_HAS_THREADS)
+      target_include_directories(${APPNAME} PRIVATE ${FFTW_INCLUDE_DIR})
+      target_link_libraries(${APPNAME} PRIVATE ${FFTW_LIBRARY})
     endif()
   endif()
 endif()
-if(FFTW3_HAS_THREADS)
-  target_compile_definitions(${APPNAME} PRIVATE FFTW3_HAS_THREADS=1)
+if(FFTW_HAS_THREADS)
+  target_compile_definitions(${APPNAME} PRIVATE FFTW_HAS_THREADS=1)
 endif()
 setup_score_common_exe_features(${APPNAME})
 

CMakeLists.txt

@@ -192,15 +192,18 @@ static void setup_x11(int argc, char** argv)
 #endif
 }
 
+#if defined(__linux__)
+extern "C" {
+enum SuilArg
+{
+  SUIL_ARG_NONE
+};
+using suil_init_t = void (*)(int* argc, char*** argv, SuilArg key, ...);
+}
+#endif
 static void setup_suil()
 {
 #if defined(__linux__)
-  enum SuilArg
-  {
-    SUIL_ARG_NONE
-  };
-  using suil_init_t = void (*)(int* argc, char*** argv, SuilArg key, ...);
-
   if(auto lib = dlopen("libsuil-0.so.0", RTLD_LAZY | RTLD_LOCAL))
   {
     // 1. Init suil
@@ -547,7 +550,7 @@ static void setup_app_flags()
 #endif
 }
 
-#if FFTW3_HAS_THREADS
+#if FFTW_HAS_THREADS
 #include <fftw3.h>
 static void setup_fftw()
 {

src/app/CMakeLists.txt

@@ -316,7 +316,8 @@ LV2Data::LV2Data(HostContext& h, EffectContext& ctx)
   for(auto res :
       {effect.plugin.get_required_features(), effect.plugin.get_optional_features()})
   {
-    std::cerr << effect.plugin.get_name().as_string() << " requires " << std::endl;
+    std::cerr << get_lv2_plugin_name(effect.plugin).toStdString() << " requires "
+              << std::endl;
     auto it = res.begin();
     while(it)
     {

src/app/main.cpp

@@ -29,6 +29,8 @@
 
 #include <boost/bimap.hpp>
 
+#include <QString>
+
 #include <lilv/lilvmm.hpp>
 
 #include <readerwriterqueue.h>
@@ -227,4 +229,6 @@ struct Message
   uint32_t protocol;
   ossia::small_vector<uint8_t, 32> body;
 };
+
+QString get_lv2_plugin_name(const Lilv::Plugin& node);
 }

src/plugins/score-plugin-lv2/LV2/Context.cpp

@@ -36,6 +36,17 @@
 W_OBJECT_IMPL(LV2::Model)
 namespace LV2
 {
+QString get_lv2_plugin_name(const Lilv::Plugin& node)
+{
+  QString ret;
+  if(auto pname = lilv_plugin_get_name(node.me))
+  {
+    if(auto str = lilv_node_as_string(pname))
+      ret = QString::fromUtf8(str);
+    lilv_node_free(pname);
+  }
+  return ret;
+};
 std::optional<Lilv::Plugin> find_lv2_plugin(Lilv::World& world, QString path)
 {
   static ossia::hash_map<QString, const LilvPlugin*> plug_map;
@@ -60,13 +71,14 @@ std::optional<Lilv::Plugin> find_lv2_plugin(Lilv::World& world, QString path)
   while(!plugs.is_end(it))
   {
     auto plug = plugs.get(it);
+    const auto plugin_name = get_lv2_plugin_name(plug);
     if((isFile && QString(plug.get_bundle_uri().as_string()) == path)
-       || (!isFile && QString(plug.get_name().as_string()) == path))
+       || (!isFile && plugin_name == path))
     {
       plug_map[old_str] = plug;
       return plug;
     }
-    else if(!isFile && QString(plug.get_name().as_string()) == path)
+    else if(!isFile && plugin_name == path)
     {
       plug_map[old_str] = plug;
       return plug;
@@ -105,7 +117,7 @@ struct LV2PluginChooserDialog : public QDialog
     {
       auto plug = plugs.get(it);
       const auto class_name = plug.get_class().get_label().as_string();
-      const auto plug_name = plug.get_name().as_string();
+      const auto plug_name = get_lv2_plugin_name(plug);
       auto sub_it = m_categories_map.find(class_name);
       if(sub_it == m_categories_map.end())
       {
@@ -174,7 +186,7 @@ static Process::Descriptor make_descriptor(Lilv::Plugin plug)
   Process::Descriptor desc;
   auto& app_plug = score::AppComponents().applicationPlugin<LV2::ApplicationPlugin>();
   auto& host = app_plug.lv2_host_context;
-  desc.prettyName = plug.get_name().as_string();
+  desc.prettyName = LV2::get_lv2_plugin_name(plug);
   desc.categoryText = plug.get_class().get_label().as_string();
   desc.description = plug.get_author_homepage().as_string();
   desc.author = plug.get_author_name().as_string();

src/plugins/score-plugin-lv2/LV2/Context.hpp

@@ -32,7 +32,7 @@ class LibraryHandler final : public Library::LibraryInterface
     {
       auto plug = plugs.get(it);
       const auto class_name = plug.get_class().get_label().as_string();
-      const auto plug_name = plug.get_name().as_string();
+      const auto plug_name = get_lv2_plugin_name(plug);
       categories[class_name].push_back(plug_name);
       it = plugs.next(it);
     }