Merge pull request #22 from darbyjohnston/rocky8_fixes

Rocky 8 fixes
OpenTimelineIO · Nov 17, 2024 · b476d36 · b476d36
2 parents a613ddd + a4ea0c2
commit b476d36
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 227 deletions.
diff --git a/cmake/SuperBuild/Builddtk-deps.cmake b/cmake/SuperBuild/Builddtk-deps.cmake
@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(dtk_GIT_REPOSITORY "https://github.com/darbyjohnston/dtk.git")
-set(dtk_GIT_TAG "ff2b7dcbbaf6eb8dc3568922f7c84b7c34c2c8dd")
+set(dtk_GIT_TAG "0dd29ed19c12702d9304c6273576117fa8648a23")
 
 set(dtk-deps_ARGS
     ${toucan_EXTERNAL_PROJECT_ARGS}

diff --git a/cmake/SuperBuild/Builddtk.cmake b/cmake/SuperBuild/Builddtk.cmake
@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(dtk_GIT_REPOSITORY "https://github.com/darbyjohnston/dtk.git")
-set(dtk_GIT_TAG "ff2b7dcbbaf6eb8dc3568922f7c84b7c34c2c8dd")
+set(dtk_GIT_TAG "0dd29ed19c12702d9304c6273576117fa8648a23")
 
 set(dtk_DEPS dtk-deps)
 set(dtk_ARGS

diff --git a/lib/toucan/CMakeLists.txt b/lib/toucan/CMakeLists.txt
@@ -43,11 +43,11 @@ else()
 endif()
 
 add_library(toucan ${HEADERS} ${HEADERS_PRIVATE} ${SOURCE})
-set(LIBS PUBLIC OTIO::opentimelineio OTIO::opentime OpenImageIO::OpenImageIO)
-if(TARGET MINIZIP::minizip)
-    list(APPEND LIBS MINIZIP::minizip)
+set(LIBS_PUBLIC OTIO::opentimelineio OTIO::opentime OpenImageIO::OpenImageIO MINIZIP::minizip)
+if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
+    list(APPEND LIBS_PUBLIC stdc++fs)
 endif()
-target_link_libraries(toucan ${LIBS})
+target_link_libraries(toucan PUBLIC ${LIBS_PUBLIC})
 set_target_properties(toucan PROPERTIES FOLDER lib)
 set_target_properties(toucan PROPERTIES PUBLIC_HEADER "${HEADERS}")
 

diff --git a/lib/toucan/Timeline.cpp b/lib/toucan/Timeline.cpp
diff --git a/lib/toucan/Timeline.h b/lib/toucan/Timeline.h
diff --git a/lib/toucan/TimelineWrapper.cpp b/lib/toucan/TimelineWrapper.cpp
@@ -252,10 +252,10 @@ namespace toucan
 
     TimelineWrapper::~TimelineWrapper()
     {
-        if (!_tmpPath.empty())
-        {
-            std::filesystem::remove_all(_tmpPath);
-        }
+        //if (!_tmpPath.empty())
+        //{
+        //    std::filesystem::remove_all(_tmpPath);
+        //}
     }
 
     const OTIO_NS::SerializableObject::Retainer<OTIO_NS::Timeline>& TimelineWrapper::getTimeline() const
@@ -276,14 +276,14 @@ namespace toucan
             std::filesystem::path path = splitURLProtocol(url).second;
             if (!path.is_absolute())
             {
-                if (!_tmpPath.empty())
-                {
-                    path = _tmpPath / path;
-                }
-                else
-                {
+                //if (!_tmpPath.empty())
+                //{
+                //    path = _tmpPath / path;
+                //}
+                //else
+                //{
                     path = _path.parent_path() / path;
-                }
+                //}
             }
             out = path.string();
         }

diff --git a/lib/toucan/TimelineWrapper.h b/lib/toucan/TimelineWrapper.h
@@ -32,7 +32,7 @@ namespace toucan
 
     private:
         std::filesystem::path _path;
-        std::filesystem::path _tmpPath;
+        //std::filesystem::path _tmpPath;
         std::unique_ptr<MemoryMap> _memoryMap;
         MemoryReferences _memoryReferences;
         OTIO_NS::SerializableObject::Retainer<OTIO_NS::Timeline> _timeline;

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -3,11 +3,11 @@ foreach(PLUGIN ColorSpace Draw Filter Generator Transform Transition)
         toucan${PLUGIN} MODULE
         ${PLUGIN}Plugin.h Plugin.h Util.h
         ${PLUGIN}Plugin.cpp Plugin.cpp Util.cpp)
-    set(LIBS OpenImageIO::OpenImageIO)
-    if(TARGET MINIZIP::minizip)
-        list(APPEND LIBS MINIZIP::minizip)
+    set(LIBS_PUBLIC OpenImageIO::OpenImageIO MINIZIP::minizip)
+    if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
+        list(APPEND LIBS_PUBLIC stdc++fs)
     endif()
-    target_link_libraries(toucan${PLUGIN} PUBLIC ${LIBS})
+    target_link_libraries(toucan${PLUGIN} PUBLIC ${LIBS_PUBLIC})
     set_target_properties(
         toucan${PLUGIN} PROPERTIES
         FOLDER plugin

diff --git a/plugins/ColorSpacePlugin.cpp b/plugins/ColorSpacePlugin.cpp
@@ -217,7 +217,7 @@ OfxStatus ColorConvertPlugin::_render(
     _paramSuite->paramGetValue(_contextValueParam[handle], &contextValue);
     _paramSuite->paramGetValue(_colorConfigParam[handle], &colorConfigValue);
 
-    const std::filesystem::path colorConfigPath(colorConfigValue);
+    const std::string colorConfigPath(colorConfigValue);
     std::shared_ptr<OIIO::ColorConfig> colorConfig;
     auto i = _colorConfigs.find(colorConfigPath);
     if (i != _colorConfigs.end())
@@ -226,7 +226,7 @@ OfxStatus ColorConvertPlugin::_render(
     }
     else
     {
-        colorConfig = std::make_shared<OIIO::ColorConfig>(colorConfigPath.string());
+        colorConfig = std::make_shared<OIIO::ColorConfig>(colorConfigPath);
         _colorConfigs[colorConfigPath] = colorConfig;
         //for (int i = 0; i < colorConfig->getNumColorSpaces(); ++i)
         //{

diff --git a/plugins/ColorSpacePlugin.h b/plugins/ColorSpacePlugin.h
@@ -8,8 +8,6 @@
 #include <OpenImageIO/color.h>
 #include <OpenImageIO/imagebuf.h>
 
-#include <filesystem>
-
 class ColorSpacePlugin : public Plugin
 {
 public:
@@ -70,7 +68,7 @@ class ColorConvertPlugin : public ColorSpacePlugin
     std::map<OfxImageEffectHandle, OfxParamHandle> _contextKeyParam;
     std::map<OfxImageEffectHandle, OfxParamHandle> _contextValueParam;
     std::map<OfxImageEffectHandle, OfxParamHandle> _colorConfigParam;
-    std::map<std::filesystem::path, std::shared_ptr<OIIO::ColorConfig> > _colorConfigs;
+    std::map<std::string, std::shared_ptr<OIIO::ColorConfig> > _colorConfigs;
 };
 
 class PremultPlugin : public ColorSpacePlugin