Merge remote-tracking branch 'origin/master' into prerelease

Author: iwalton3

.github/workflows/main.yml

@@ -92,7 +92,7 @@ jobs:
         curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip
         unzip ninja.zip
         mv ninja.exe build/
-        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-v3-20240304-git-9ac791c.7z/download > mpv.7z
+        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20240304-git-9ac791c.7z/download > mpv.7z
         7z x mpv.7z
         mkdir mpv
         mv include mpv
@@ -136,7 +136,7 @@ jobs:
         curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip
         unzip ninja.zip
         mv ninja.exe build/
-        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20240304-git-9ac791c.7z/download > mpv.7z
+        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-v3-20240304-git-9ac791c.7z/download > mpv.7z
         7z x mpv.7z
         mkdir mpv
         mv include mpv
@@ -208,6 +208,7 @@ jobs:
 
   build-ubuntu:
     strategy:
+      fail-fast: false
       matrix:
         tag: [oracular, noble, jammy]
     runs-on: "ubuntu-latest"
@@ -230,6 +231,7 @@ jobs:
 
   build-debian:
     strategy:
+      fail-fast: false
       matrix:
         tag: [bookworm, trixie]
     runs-on: "ubuntu-latest"

CMakeLists.txt

@@ -10,9 +10,14 @@ project(JellyfinMediaPlayer CXX C)
 # we want this to be able to run clang-tidy
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "" FORCE)
 
+option(CHECK_FOR_UPDATES "Enable checking for new versions of Jellyfin Media Player" ON)
 option(OPENELEC "Make an OpenELEC build" OFF)
 option(LINUX_X11POWER "Enable non D-Bus screensaver management" OFF)
 
+if (NOT CHECK_FOR_UPDATES)
+    add_definitions(-DDISABLE_UPDATE_CHECK)
+endif()
+
 if((NOT LINUX_X11POWER) AND (UNIX AND (NOT APPLE)))
   set(LINUX_DBUS ON)
 endif()
@@ -41,7 +46,6 @@ endmacro()
 set_policy(CMP0020 NEW)
 set_policy(CMP0017 NEW)
 set_policy(CMP0058 NEW)
-set_policy(CMP0026 OLD)
 set_policy(CMP0071 NEW)
 set_policy(CMP0072 NEW)
 set_policy(CMP0148 OLD)

CMakeModules/utils.cmake

@@ -17,20 +17,22 @@ function(copy_resources target)
 
   get_property(RESOURCE_LIST GLOBAL PROPERTY _${target}_RESOURCE_LIST)
 
-  # we read the LOCATION from the target instead of using a generator
-  # here since add_custom_command doesn't support generator expresessions
-  # in the output field, and this is still cleaner than hardcoding the path
-  # of the output binary.
-  #  
-  get_property(TARGET_LOC TARGET ${target} PROPERTY LOCATION)
-  get_filename_component(TARGET_DIR ${TARGET_LOC} DIRECTORY)
-  if(APPLE)
-    set(TARGET_LOC ${TARGET_DIR}/..)
-  else()
-    set(TARGET_LOC ${TARGET_DIR})
-  endif()
-  
   if(RESOURCE_LIST)
+    set_policy(CMP0026 OLD)
+
+    # we read the LOCATION from the target instead of using a generator
+    # here since add_custom_command doesn't support generator expresessions
+    # in the output field, and this is still cleaner than hardcoding the path
+    # of the output binary.
+    #
+    get_property(TARGET_LOC TARGET ${target} PROPERTY LOCATION)
+    get_filename_component(TARGET_DIR ${TARGET_LOC} DIRECTORY)
+    if(APPLE)
+      set(TARGET_LOC ${TARGET_DIR}/..)
+    else()
+      set(TARGET_LOC ${TARGET_DIR})
+    endif()
+
     foreach(RF ${RESOURCE_LIST})
       string(REPLACE "|" ";" PARTS "${RF}")
       list(GET PARTS 0 SOURCE_FILE)

src/main.cpp

@@ -82,10 +82,7 @@ void ShowLicenseInfo()
 /////////////////////////////////////////////////////////////////////////////////////////
 QStringList g_qtFlags = {
   "--disable-web-security",
-  "--enable-gpu-rasterization",
-#ifdef Q_OS_LINUX
-  "--disable-gpu"
-#endif
+  "--enable-gpu-rasterization"
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -110,7 +107,7 @@ int main(int argc, char *argv[])
                                                           "the scale (DPI) of the desktop interface.");
     scaleOption.setValueName("scale");
     scaleOption.setDefaultValue("auto");
-
+    
     auto platformOption = QCommandLineOption("platform", "Equivalant to QT_QPA_PLATFORM.");
     platformOption.setValueName("platform");
     platformOption.setDefaultValue("default");
@@ -173,7 +170,7 @@ int main(int argc, char *argv[])
     QApplication app(newArgc, newArgv);
     app.setApplicationName("Jellyfin Media Player");
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) 
     // Setting window icon on OSX will break user ability to change it
     app.setWindowIcon(QIcon(":/images/icon.png"));
 #endif

src/settings/SettingsComponent.cpp

@@ -305,6 +305,10 @@ void SettingsComponent::loadConf(const QString& path, bool storage)
       getSection(SETTINGS_SECTION_MAIN)->setValue("autodetectCertBundle", "true");
     }
   }
+
+#ifdef DISABLE_UPDATE_CHECK
+    getSection(SETTINGS_SECTION_MAIN)->setValueHidden("checkForUpdates", "true");
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

src/system/SystemComponent.cpp

@@ -360,6 +360,7 @@ QString SystemComponent::getNativeShellScript()
 /////////////////////////////////////////////////////////////////////////////////////////
 void SystemComponent::checkForUpdates()
 {
+#ifndef DISABLE_UPDATE_CHECK
   if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "checkForUpdates").toBool()) {
 #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
     QNetworkAccessManager *manager = new QNetworkAccessManager(this);
@@ -374,6 +375,7 @@ void SystemComponent::checkForUpdates()
     emit updateInfoEmitted("SSL_UNAVAILABLE");
 #endif
   }
+#endif
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////