Fix cmake configure errors during download retry

Returns version and commit information

cmake/common/buildspec_common.cmake

@@ -191,14 +191,21 @@ function(_check_dependencies)
       foreach(i RANGE 1 ${MAX_DOWNLOAD_RETRIES})
         message(STATUS "Attempt ${i}/${MAX_DOWNLOAD_RETRIES} for ${url}")
 
-        file(
-          DOWNLOAD "${url}" "${dependencies_dir}/${file}"
-          STATUS download_status
-          EXPECTED_HASH SHA256=${hash})
+        file(DOWNLOAD "${url}" "${dependencies_dir}/${file}"
+             STATUS download_status)
 
         list(GET download_status 0 error_code)
         list(GET download_status 1 error_message)
 
+        if(error_code EQUAL 0)
+          file(SHA256 "${dependencies_dir}/${file}" actual_hash)
+          if(NOT actual_hash STREQUAL hash)
+            set(error_code 1)
+            set(error_message
+                "hash mismatch (expected ${hash}, got ${actual_hash})")
+          endif()
+        endif()
+
         if(error_code EQUAL 0)
           message(STATUS "Downloading ${url} - success on attempt ${i}")
           set(download_success TRUE)

lib/utils/websocket-api.cpp

@@ -1,6 +1,7 @@
 #include "websocket-api.hpp"
 #include "obs-websocket-api.h"
 #include "plugin-state-helpers.hpp"
+#include "version.h"
 
 // Must be after "obs-websocket-api.h" to avoid logging function conflict
 #include "log-helper.hpp"
@@ -15,6 +16,7 @@ static constexpr char VendorName[] = "AdvancedSceneSwitcher";
 static constexpr char VendorRequestStart[] = "AdvancedSceneSwitcherStart";
 static constexpr char VendorRequestStop[] = "AdvancedSceneSwitcherStop";
 static constexpr char VendorRequestStatus[] = "IsAdvancedSceneSwitcherRunning";
+static constexpr char VendorRequestVersion[] = "AdvancedSceneSwitcherVersion";
 static obs_websocket_vendor vendor;
 
 static void registerWebsocketVendor();
@@ -82,6 +84,12 @@ static void registerWebsocketVendor()
 			obs_data_set_bool(response, "isRunning",
 					  PluginIsRunning());
 		});
+	registerWebsocketVendorRequest(
+		VendorRequestVersion,
+		[](obs_data_t *, obs_data_t *response, void *) {
+			obs_data_set_string(response, "version", g_GIT_TAG);
+			obs_data_set_string(response, "commit", g_GIT_SHA1);
+		});
 }
 
 const char *GetWebsocketVendorName()

plugins/speech/CMakeLists.txt

@@ -61,9 +61,14 @@ function(_advss_whisper_suppress_werror dir)
     endif()
     target_compile_options(
       ${_target}
-      PRIVATE $<$<C_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error>
-              $<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error>
-              $<$<C_COMPILER_ID:MSVC>:/WX-> $<$<CXX_COMPILER_ID:MSVC>:/WX->)
+      PRIVATE $<$<C_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error
+              -Wno-shorten-64-to-32
+              -Wno-ambiguous-macro>
+              $<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-error
+              -Wno-shorten-64-to-32
+              -Wno-ambiguous-macro>
+              $<$<C_COMPILER_ID:MSVC>:/WX->
+              $<$<CXX_COMPILER_ID:MSVC>:/WX->)
   endforeach()
 endfunction()