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

Author: iwalton3

.github/workflows/main.yml

@@ -28,7 +28,18 @@ jobs:
         python3 ./scripts/fix-webengine.py ./build/output/Jellyfin\ Media\ Player.app
         codesign --force --deep -s - ./build/output/Jellyfin\ Media\ Player.app/
         brew install create-dmg
-        create-dmg --volname "Jellyfin Media Player" --no-internet-enable "JellyfinMediaPlayer.dmg" "./build/output/Jellyfin Media Player.app"
+        attempts=0
+        while [[ "$attempts" -lt 10 ]]
+        do
+          attempts=$((attempts+1))
+          create-dmg --volname "Jellyfin Media Player" --no-internet-enable "JellyfinMediaPlayer.dmg" "./build/output/Jellyfin Media Player.app" && break || echo "dmg create failed, retrying..."
+          sleep 5
+        done
+        if ! [[ -e JellyfinMediaPlayer.dmg ]]
+        then
+          echo "Failed to create dmg after 10 attempts"
+          exit 1
+        fi
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4
       with:

CMakeModules/VersionConfiguration.cmake

@@ -21,13 +21,13 @@ else()
 endif()
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 11)
-set(VERSION_NANO 1)
+set(VERSION_MINOR 12)
+set(VERSION_NANO 0)
 
 option(UPGRADE_DEBUG "" OFF)
 
-set(VERSION_STRING "1.11.1")
-set(VERSION_STRING_SHORT "1.11.1")
-set(CANONICAL_VERSION_STRING "1.11.1")
+set(VERSION_STRING "1.12.0")
+set(VERSION_STRING_SHORT "1.12.0")
+set(CANONICAL_VERSION_STRING "1.12.0")
 
 configure_file(src/core/Version.cpp.in src/core/Version.cpp)

debian/changelog

@@ -1,3 +1,15 @@
+jellyfin-media-player (1.12.0-1) unstable; urgency=medium
+
+  * Prevent issue where wayland has black screen due to broken gpu accel (#165, #610)
+  * Prevent SRT text being squished and unreadable (#643)
+  * Handle server connection timeout. (#747)
+  * Remove obsolete skip intro support.
+  * Update branding
+  * Fix caching issues to prevent broken web client when the server web version updates
+  * Auto fill last used server into server box if server connection fails on startup
+
+ -- Izzie Walton <[email protected]>  Tue, 18 Mar 2025 10:50:29 -0400
+
 jellyfin-media-player (1.11.1-1) unstable; urgency=medium
 
   * Fix client not connecting to servers with baseurl set.

resources/meta/com.github.iwalton3.jellyfin-media-player.appdata.xml

@@ -42,6 +42,20 @@
     <category>TV</category>
   </categories>
   <releases>
+      <release version="1.12.0" date="2025-03-18">
+        <description>
+          <p>Changes:</p>
+          <ul>
+            <li>Prevent issue where wayland has black screen due to broken gpu accel (#165, #610)</li>
+            <li>Prevent SRT text being squished and unreadable (#643)</li>
+            <li>Handle server connection timeout. (#747)</li>
+            <li>Remove obsolete skip intro support.</li>
+            <li>Update branding</li>
+            <li>Fix caching issues to prevent broken web client when the server web version updates</li>
+            <li>Auto fill last used server into server box if server connection fails on startup</li>
+          </ul>
+        </description>
+      </release>
       <release version="1.11.1" date="2024-06-07">
         <description>
           <p>Changes:</p>