From 790ccc320e26f62ceeb2dd1196fd970e127f0b3d Mon Sep 17 00:00:00 2001 From: Bruno Date: Wed, 10 Nov 2021 21:16:16 +0100 Subject: [PATCH] OSX bundle install of Frei0r plugins --- CMakeLists.txt | 13 ++++++++++--- RenderingManager.cpp | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc2ec35..9b85a53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -586,9 +586,16 @@ IF(APPLE) install(DIRECTORY "/usr/local/Cellar/gst-libav/1.18.4/lib/gstreamer-1.0" DESTINATION "${plugin_dest_dir}" COMPONENT Runtime) # install locally recompiled & installed gst-plugins (because not included in brew package) - install(FILES "/usr/local/lib/gstreamer-1.0/libgstapplemedia.dylib" DESTINATION "${plugin_dest_dir}/gstreamer-1.0" COMPONENT Runtime) - install(FILES "/usr/local/lib/gstreamer-1.0/libgstde265.dylib" DESTINATION "${plugin_dest_dir}/gstreamer-1.0" COMPONENT Runtime) - install(FILES "/usr/local/lib/gstreamer-1.0/libgstx265.dylib" DESTINATION "${plugin_dest_dir}/gstreamer-1.0" COMPONENT Runtime) + install(FILES "/usr/local/lib/gstreamer-1.0/libgstapplemedia.dylib" + "/usr/local/lib/gstreamer-1.0/libgstde265.dylib" + "/usr/local/lib/gstreamer-1.0/libgstx265.dylib" + DESTINATION "${plugin_dest_dir}/gstreamer-1.0" COMPONENT Runtime) + + # install frei0r plugins (dependencies of gstreamer-1.0/libgstfrei0r.dylib plugin) + install(FILES "/usr/local/Cellar/frei0r/1.7.0/lib/frei0r-1/lissajous0r.so" + "/usr/local/Cellar/frei0r/1.7.0/lib/frei0r-1/rgbnoise.so" + DESTINATION "${plugin_dest_dir}/frei0r-1" COMPONENT Runtime) + # ICU DATA LIB GST dependency : undocumented and hacked here : seems to work # install(FILES "${ICU_LINK_LIBRARIES}" DESTINATION "${plugin_dest_dir}/gstreamer-1.0" COMPONENT Runtime) diff --git a/RenderingManager.cpp b/RenderingManager.cpp index 3528429..b50b88b 100644 --- a/RenderingManager.cpp +++ b/RenderingManager.cpp @@ -200,6 +200,11 @@ bool Rendering::init() g_setenv ("GST_PLUGIN_SYSTEM_PATH", plugins_path.c_str(), TRUE); g_setenv ("GST_PLUGIN_SCANNER", plugins_scanner.c_str(), TRUE); } + std::string frei0r_path = SystemToolkit::cwd_path() + "frei0r-1" ; + if ( SystemToolkit::file_exists(frei0r_path)) { + Log::Info("Found Frei0r plugins in %s", frei0r_path.c_str()); + g_setenv ("FREI0R_PATH", frei0r_path.c_str(), TRUE); + } g_setenv ("GST_GL_API", "opengl3", TRUE); gst_init (NULL, NULL);