5 files changed, 16 insertions, 16 deletions
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
index 3f6c7ac6da..1564083b7c 100644
--- a/cmake/scripts/linux/Install.cmake
+++ b/cmake/scripts/linux/Install.cmake
@@ -188,7 +188,7 @@ install(FILES ${CMAKE_SOURCE_DIR}/cmake/scripts/common/AddonHelpers.cmake
               ${CMAKE_SOURCE_DIR}/cmake/scripts/common/ArchSetup.cmake
               ${CMAKE_SOURCE_DIR}/cmake/scripts/common/CheckCommits.cmake
               ${CMAKE_SOURCE_DIR}/cmake/scripts/common/CheckTargetPlatform.cmake
-              ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GenerateVersionedFiles.cmake
+              ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GenerateCompileInfo.cmake
               ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GeneratorSetup.cmake
               ${CMAKE_SOURCE_DIR}/cmake/scripts/common/HandleDepends.cmake
               ${CMAKE_SOURCE_DIR}/cmake/scripts/common/Macros.cmake
diff --git a/tools/depends/native/rustup/Makefile b/tools/depends/native/rustup/Makefile
index 13d145cccd..0c699b952d 100644
--- a/tools/depends/native/rustup/Makefile
+++ b/tools/depends/native/rustup/Makefile
@@ -26,7 +26,7 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 
 $(APP): $(PLATFORM)
-	bash $(PLATFORM)/rustup-init.sh -y --no-modify-path \
+	./$(PLATFORM)/rustup-init.sh -y --no-modify-path \
 		--profile minimal \
 		--default-toolchain=$(RUST_TOOLCHAIN_VERSION)
 
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireGlobal.h b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireGlobal.h
index 7b1021ae38..67f40c7220 100644
--- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireGlobal.h
+++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireGlobal.h
@@ -29,21 +29,21 @@ public:
   CPipewireGlobal() = default;
   ~CPipewireGlobal();
 
-  CPipewireGlobal& SetName(std::string_view name)
+  CPipewireGlobal& SetName(const std::string& name)
   {
     m_name = name;
     return *this;
   }
 
-  std::string_view GetName() const { return m_name; }
+  std::string GetName() const { return m_name; }
 
-  CPipewireGlobal& SetDescription(std::string_view description)
+  CPipewireGlobal& SetDescription(const std::string& description)
   {
     m_description = description;
     return *this;
   }
 
-  std::string_view GetDescription() const { return m_description; }
+  std::string GetDescription() const { return m_description; }
 
   CPipewireGlobal& SetID(uint32_t id)
   {
@@ -61,13 +61,13 @@ public:
 
   uint32_t GetPermissions() const { return m_permissions; }
 
-  CPipewireGlobal& SetType(std::string_view type)
+  CPipewireGlobal& SetType(const std::string& type)
   {
     m_type = type;
     return *this;
   }
 
-  std::string_view GetType() const { return m_type; }
+  std::string GetType() const { return m_type; }
 
   CPipewireGlobal& SetVersion(uint32_t version)
   {
@@ -95,11 +95,11 @@ public:
   CPipewireNode& GetNode() const { return *m_node; }
 
 private:
-  std::string_view m_name;
-  std::string_view m_description;
+  std::string m_name;
+  std::string m_description;
   uint32_t m_id;
   uint32_t m_permissions;
-  std::string_view m_type;
+  std::string m_type;
   uint32_t m_version;
   std::unique_ptr<pw_properties, PipewirePropertiesDeleter> m_properties;
   std::unique_ptr<CPipewireNode> m_node;
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
index 72419823d8..c4590feca7 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -1871,7 +1871,10 @@ void CVideoPlayer::HandlePlaySpeed()
         CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(21454), g_localizeStrings.Get(21455));
         SetCaching(CACHESTATE_INIT);
       }
-      if (cache.level >= 1.0)
+      // Note: Previously used cache.level >= 1 would keep video stalled
+      // event after cache was full
+      // Talk link: https://github.com/xbmc/xbmc/pull/23760
+      if (cache.time > 8.0)
         SetCaching(CACHESTATE_INIT);
     }
     else
diff --git a/xbmc/video/tags/VideoTagExtractionHelper.cpp b/xbmc/video/tags/VideoTagExtractionHelper.cpp
index fbab01c805..b331305fc4 100644
--- a/xbmc/video/tags/VideoTagExtractionHelper.cpp
+++ b/xbmc/video/tags/VideoTagExtractionHelper.cpp
@@ -35,10 +35,7 @@ std::string CVideoTagExtractionHelper::ExtractEmbeddedArtFor(const CFileItem& it
   for (const auto& it : tag.m_coverArt)
   {
     if (it.m_type == artType)
-    {
-      return CTextureUtils::GetWrappedImageURL(item.GetVideoInfoTag()->m_strFileNameAndPath,
-                                               "video_" + artType);
-    }
+      return CTextureUtils::GetWrappedImageURL(item.GetDynPath(), "video_" + artType);
   }
   return {};
 }