From 9733d8a0d15c0ec400564c54c848f7377b051bf2 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 30 Oct 2024 14:54:01 +1000 Subject: [PATCH] Flatpak: Swap to KDE 6.8 SDK --- scripts/flatpak/modules/25-soundtouch.yaml | 4 ++-- scripts/flatpak/org.duckstation.DuckStation.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/flatpak/modules/25-soundtouch.yaml b/scripts/flatpak/modules/25-soundtouch.yaml index 626bef06b..f3cebdaf8 100644 --- a/scripts/flatpak/modules/25-soundtouch.yaml +++ b/scripts/flatpak/modules/25-soundtouch.yaml @@ -9,8 +9,8 @@ config-opts: # Use clang with LTO for speed. - "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" - - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm17/bin/clang" - - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm17/bin/clang++" + - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang" + - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++" - "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld" diff --git a/scripts/flatpak/org.duckstation.DuckStation.yaml b/scripts/flatpak/org.duckstation.DuckStation.yaml index 923e4ef32..cf66b339e 100644 --- a/scripts/flatpak/org.duckstation.DuckStation.yaml +++ b/scripts/flatpak/org.duckstation.DuckStation.yaml @@ -3,14 +3,14 @@ app-id: "org.duckstation.DuckStation" runtime: "org.kde.Platform" -runtime-version: "6.7" +runtime-version: "6.8" sdk: "org.kde.Sdk" sdk-extensions: - - "org.freedesktop.Sdk.Extension.llvm17" + - "org.freedesktop.Sdk.Extension.llvm18" add-extensions: "org.freedesktop.Platform.ffmpeg-full": directory: "lib/ffmpeg" - version: "23.08" + version: "24.08" add-ld-path: "." autodownload: true @@ -73,8 +73,8 @@ modules: # Make sure we're using ThinLTO. - "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" - - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm17/bin/clang" - - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm17/bin/clang++" + - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang" + - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++" - "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld"