Merge branch 'master' of https://github.com/flathub/org.DolphinEmu.dolphin-emu

README.md

@@ -21,6 +21,8 @@
 - [Update Frequency](#update-frequency)
     - [Official Releases](#official-releases)
     - [Development Releases](#development-releases)
+- [Official Builds](#official-builds)
+- [Beta Branch](#beta-branch)
 
 ## How to connect your Wii remotes
 
@@ -151,4 +153,26 @@ If you have both the official "Release" and the "Development" release installed
 
 ```
 flatpak make-current org.DolphinEmu.dolphin-emu <beta|stable>
-```
+```
+
+## Official Builds
+
+As of `2409-260` official dev builds are available from this repo:
+
+https://flatpak.dolphin-emu.org/dev.flatpakrepo
+
+Single file bundles for `2409-260+` versions are available from the downloads section of the official dolphin site:
+
+https://dolphin-emu.org/download/
+
+## Beta Branch
+
+The beta branch is being retired, there won't be any further updates after `2412`.
+
+Switch back to the stable branch in order to receive further updates (drop the `--user` at the end if you've installed dolphin-emu at the system level):
+
+```
+flatpak make-current org.DolphinEmu.dolphin-emu stable --user
+```
+
+If for any reason you'd rather keep getting dev builds, switch to the official dev repo instead.

SDL2/SDL2-no-libdecor.json

@@ -1,22 +0,0 @@
-{
-  "name": "SDL2",
-  "buildsystem": "autotools",
-  "config-opts": ["--disable-static"],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz",
-      "sha256": "c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4"
-    }
-  ],
-  "cleanup": [ "/bin/sdl2-config",
-               "/include",
-               "/lib/libSDL2.la",
-               "/lib/libSDL2main.a",
-               "/lib/libSDL2main.la",
-               "/lib/libSDL2_test.a",
-               "/lib/libSDL2_test.la",
-               "/lib/cmake",
-               "/share/aclocal",
-               "/lib/pkgconfig"]
-}

org.DolphinEmu.dolphin-emu.metainfo.xml

@@ -36,9 +36,12 @@
     <id>dolphin-emu.desktop</id>
   </provides>
   <releases>
-    <release version="2409" date="2024-09-04">
+    <release version="2412" date="2024-12-02">
       <description></description>
     </release>
+    <release version="2409" date="2024-09-04">
+      <description/>
+    </release>
     <release version="2407" date="2024-07-02"/>
     <release version="5.0-21460" date="2024-04-29"/>
     <release version="5.0-21264" date="2024-03-26"/>

org.DolphinEmu.dolphin-emu.yml

@@ -1,6 +1,6 @@
 app-id: org.DolphinEmu.dolphin-emu
 runtime: org.kde.Platform
-runtime-version: '6.7'
+runtime-version: '6.8'
 sdk: org.kde.Sdk
 command: dolphin-emu-wrapper
 rename-desktop-file: dolphin-emu.desktop
@@ -65,9 +65,6 @@ modules:
         url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
         sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
 
-  # The kde runtime bundles 2.28.5 but current dolphin versions require 2.30.6
-  - SDL2/SDL2-no-libdecor.json
-
   - name: dolphin-emu
     buildsystem: cmake-ninja
     config-opts:
@@ -86,7 +83,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/dolphin-emu/dolphin.git
-        commit: 3c4d4fcd09173ea070dc812ab5d64ca3a3af5f29
+        commit: 992b4ea9309899ebc7ca576ebea711a70523098a
         x-checker-data:
           type: json
           url: https://dolphin-emu.org/update/latest/beta