From 0d4b7c2be23671769f3e0622744c68fbba486d01 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 12 Sep 2026 13:56:51 +0300
Subject: [PATCH 68/68] Flatpak: Update freedesktop Sdk & Platform to 26.08

See RM #2219

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 platforms/flatpak/org.freeciv.gtk3.mp.yml |  3 ++-
 platforms/flatpak/org.freeciv.gtk322.yml  |  3 ++-
 platforms/flatpak/org.freeciv.sdl2.yml    | 12 +++++++++++-
 platforms/flatpak/org.freeciv.sdl3.yml    |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/platforms/flatpak/org.freeciv.gtk3.mp.yml b/platforms/flatpak/org.freeciv.gtk3.mp.yml
index 98554293ec..44e442fd8a 100644
--- a/platforms/flatpak/org.freeciv.gtk3.mp.yml
+++ b/platforms/flatpak/org.freeciv.gtk3.mp.yml
@@ -1,6 +1,6 @@
 app-id: org.freeciv.gtk3.mp
 runtime: org.freedesktop.Platform
-runtime-version: '25.08'
+runtime-version: '26.08'
 sdk: org.freedesktop.Sdk
 command: freeciv-mp-gtk3
 rename-icon: freeciv-modpack
@@ -19,6 +19,7 @@ modules:
       - -Dclients=[]
       - -Dserver=disabled
       - -Dtools=[]
+      - -Daudio=none
     sources:
       - type: dir
         path: ../..
diff --git a/platforms/flatpak/org.freeciv.gtk322.yml b/platforms/flatpak/org.freeciv.gtk322.yml
index 4ca1af15fe..718d2fd6f7 100644
--- a/platforms/flatpak/org.freeciv.gtk322.yml
+++ b/platforms/flatpak/org.freeciv.gtk322.yml
@@ -1,6 +1,6 @@
 app-id: org.freeciv.gtk322
 runtime: org.freedesktop.Platform
-runtime-version: '25.08'
+runtime-version: '26.08'
 sdk: org.freedesktop.Sdk
 command: freeciv-gtk3.22
 rename-icon: freeciv-client
@@ -19,6 +19,7 @@ modules:
       - -Dclients=gtk3.22
       - -Dfcmp=[]
       - -Dtools=[]
+      - -Daudio=sdl3
     sources:
       - type: dir
         path: ../..
diff --git a/platforms/flatpak/org.freeciv.sdl2.yml b/platforms/flatpak/org.freeciv.sdl2.yml
index ff20484dc7..0c3aeb4128 100644
--- a/platforms/flatpak/org.freeciv.sdl2.yml
+++ b/platforms/flatpak/org.freeciv.sdl2.yml
@@ -1,6 +1,6 @@
 app-id: org.freeciv.sdl2
 runtime: org.freedesktop.Platform
-runtime-version: '25.08'
+runtime-version: '26.08'
 sdk: org.freedesktop.Sdk
 command: freeciv-sdl2
 rename-icon: freeciv-client
@@ -32,6 +32,16 @@ modules:
       - type: archive
         url: https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-2.24.0.tar.gz
         sha256: 0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd
+  - name: SDL2_mixer
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - -DSDL2MIXER_MOD=OFF
+      - -DSDL2MIXER_MIDI=OFF
+    sources:
+      - type: archive
+        url: https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.2/SDL2_mixer-2.8.2.tar.gz
+        sha256: 938dff531d00ace2296557a6599abe6f34599e2f34f0a4a08a397e2ccac8b8f7
   - name: freeciv-sdl2
     buildsystem: meson
     no-autogen: true
diff --git a/platforms/flatpak/org.freeciv.sdl3.yml b/platforms/flatpak/org.freeciv.sdl3.yml
index 3721ec1f3a..b997906616 100644
--- a/platforms/flatpak/org.freeciv.sdl3.yml
+++ b/platforms/flatpak/org.freeciv.sdl3.yml
@@ -1,6 +1,6 @@
 app-id: org.freeciv.sdl3
 runtime: org.freedesktop.Platform
-runtime-version: '25.08'
+runtime-version: '26.08'
 sdk: org.freedesktop.Sdk
 command: freeciv-sdl3
 rename-icon: freeciv-client
-- 
2.53.0