[ci] Various fixes

ossia · Apr 5, 2024 · 3a82678 · 3a82678
1 parent c3b98a1
commit 3a82678
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/3rdparty/Syphon-Framework b/3rdparty/Syphon-Framework
diff --git a/ci/mingw.build.sh b/ci/mingw.build.sh
@@ -12,11 +12,11 @@ cmake $SCORE_DIR \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=install \
   -DSCORE_DISABLED_PLUGINS="score-plugin-vst3;score-plugin-jit;score-plugin-faust" \
-  -DCMAKE_CXX_FLAGS="-Wa,-mbig-obj" \
+  -DCMAKE_CXX_FLAGS="-Wa,-mbig-obj -fexperimental-library" \
   -DCMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS=1 \
   -DCMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=1 \
   -DCMAKE_NINJA_FORCE_RESPONSE_FILE=1 \
   -DSCORE_PCH=1
 
 cmake --build .
-cmake --build . --target install
+cmake --build . --target install
diff --git a/src/plugins/score-plugin-gfx/Gfx/CameraDevice.cpp b/src/plugins/score-plugin-gfx/Gfx/CameraDevice.cpp
@@ -217,8 +217,10 @@ CameraSettingsWidget::CameraSettingsWidget(QWidget* parent)
   m_layout->addRow(tr("Device"), m_device);
   m_layout->addRow(tr("Input"), m_input);
 
+#if QT_VERSION > QT_VERSION_CHECK(6, 4, 0)
   m_layout->setRowVisible(1, false);
   m_layout->setRowVisible(2, false);
+#endif
 
   const auto& info = LibavIntrospection::instance();
   for(auto& demux : info.demuxers)
@@ -270,9 +272,11 @@ void CameraSettingsWidget::setSettings(const Device::DeviceSettings& settings)
   const CameraSettings& set = settings.deviceSpecificSettings.value<CameraSettings>();
   m_device->setText(set.device);
 
+#if QT_VERSION > QT_VERSION_CHECK(6, 4, 0)
   bool showCustom = set.input == "<CUSTOM>";
   m_layout->setRowVisible(1, showCustom);
   m_layout->setRowVisible(2, showCustom);
+#endif
 }
 
 }