[ci] macOS build fixes

ossia · Apr 6, 2024 · a96f290 · a96f290
1 parent 41246af
commit a96f290
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/3rdparty/libossia b/3rdparty/libossia
diff --git a/src/plugins/score-plugin-gfx/CMakeLists.txt b/src/plugins/score-plugin-gfx/CMakeLists.txt
@@ -335,6 +335,12 @@ if(WIN32)
 elseif(APPLE)
   target_sources(${PROJECT_NAME} PRIVATE Gfx/CameraDevice.avf.mm)
 
+  set_source_files_properties(
+    Gfx/CameraDevice.avf.mm
+    PROPERTIES
+      SKIP_UNITY_BUILD_INCLUSION 1
+  )
+
   add_subdirectory("${3RDPARTY_FOLDER}/Syphon-Framework" "${CMAKE_CURRENT_BINARY_DIR}/Syphon")
   target_link_libraries(${PROJECT_NAME} PRIVATE Syphon)
   target_compile_definitions(${PROJECT_NAME} PRIVATE HAS_SYPHON)

diff --git a/src/plugins/score-plugin-gfx/Gfx/Libav/AudioFrameEncoder.hpp b/src/plugins/score-plugin-gfx/Gfx/Libav/AudioFrameEncoder.hpp
@@ -25,7 +25,7 @@ struct AudioFrameEncoder
   int target_buffer_size{};
 };
 
-struct S16IAudioFrameEncoder : AudioFrameEncoder
+struct S16IAudioFrameEncoder final : AudioFrameEncoder
 {
   using AudioFrameEncoder::AudioFrameEncoder;
 
@@ -47,7 +47,7 @@ struct S16IAudioFrameEncoder : AudioFrameEncoder
   }
 };
 
-struct S24IAudioFrameEncoder : AudioFrameEncoder
+struct S24IAudioFrameEncoder final : AudioFrameEncoder
 {
   using AudioFrameEncoder::AudioFrameEncoder;
 
@@ -68,7 +68,7 @@ struct S24IAudioFrameEncoder : AudioFrameEncoder
   }
 };
 
-struct S32IAudioFrameEncoder : AudioFrameEncoder
+struct S32IAudioFrameEncoder final : AudioFrameEncoder
 {
   using AudioFrameEncoder::AudioFrameEncoder;
 
@@ -89,7 +89,7 @@ struct S32IAudioFrameEncoder : AudioFrameEncoder
   }
 };
 
-struct FltIAudioFrameEncoder : AudioFrameEncoder
+struct FltIAudioFrameEncoder final : AudioFrameEncoder
 {
   using AudioFrameEncoder::AudioFrameEncoder;
 
@@ -111,7 +111,7 @@ struct FltIAudioFrameEncoder : AudioFrameEncoder
   }
 };
 
-struct DblIAudioFrameEncoder : AudioFrameEncoder
+struct DblIAudioFrameEncoder final : AudioFrameEncoder
 {
   using AudioFrameEncoder::AudioFrameEncoder;
 
@@ -133,7 +133,7 @@ struct DblIAudioFrameEncoder : AudioFrameEncoder
   }
 };
 
-struct FltPAudioFrameEncoder : AudioFrameEncoder
+struct FltPAudioFrameEncoder final : AudioFrameEncoder
 {
   using AudioFrameEncoder::AudioFrameEncoder;
 

diff --git a/...plugins/score-plugin-scenario/Scenario/Document/ScenarioDocument/ScenarioDocumentView.cpp b/...plugins/score-plugin-scenario/Scenario/Document/ScenarioDocument/ScenarioDocumentView.cpp
@@ -280,7 +280,7 @@ void ProcessGraphicsView::checkAndRemoveCurrentDialog(QPoint pos)
   // Close the small output panels (gain/pan, etc) if we're clicking somewhere else
   if(auto dialog = this->scene()->activePanel())
   {
-    const auto notChildOfDialog = [this, dialog](QGraphicsItem* item) {
+    const auto notChildOfDialog = [dialog](QGraphicsItem* item) {
       if(!item)
         return true;