ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI/Flatpak: Bump to KDE 6.6 runtime

This commit is contained in:
Stenzek 2023-10-25 13:55:50 +10:00 committed by Connor McLaughlin
parent f025261ddf
commit d58d84dbcf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json vendored
View File

@ -1,10 +1,10 @@
{ {
"app-id": "net.pcsx2.PCSX2", "app-id": "net.pcsx2.PCSX2",
"runtime": "org.kde.Platform", "runtime": "org.kde.Platform",
"runtime-version": "6.5", "runtime-version": "6.6",
"sdk": "org.kde.Sdk", "sdk": "org.kde.Sdk",
"sdk-extensions": [ "sdk-extensions": [
"org.freedesktop.Sdk.Extension.llvm16" "org.freedesktop.Sdk.Extension.llvm17"
], ],
"add-extensions": { "add-extensions": {
"org.freedesktop.Platform.ffmpeg-full": { "org.freedesktop.Platform.ffmpeg-full": {
@ -39,8 +39,8 @@
"env": { "env": {
"DEPS_PREFIX": "/app", "DEPS_PREFIX": "/app",
"COMPILER": "clang", "COMPILER": "clang",
"CLANG_PATH": "/usr/lib/sdk/llvm16/bin/clang", "CLANG_PATH": "/usr/lib/sdk/llvm17/bin/clang",
"CLANGXX_PATH": "/usr/lib/sdk/llvm16/bin/clang++", "CLANGXX_PATH": "/usr/lib/sdk/llvm17/bin/clang++",
"ADDITIONAL_CMAKE_ARGS": "-DUSE_LINKED_FFMPEG=ON" "ADDITIONAL_CMAKE_ARGS": "-DUSE_LINKED_FFMPEG=ON"
} }
}, },

6
.github/workflows/scripts/linux/install-packages-flatpak.sh vendored
View File

@ -6,8 +6,8 @@ source "$SCRIPTDIR/functions.sh"
set -e set -e
ARCH=x86_64 ARCH=x86_64
KDE_BRANCH=6.5 KDE_BRANCH=6.6
BRANCH=22.08 BRANCH=23.08
FLAT_MANAGER_CLIENT_DIR="$HOME/.local/bin" FLAT_MANAGER_CLIENT_DIR="$HOME/.local/bin"
# Build packages. Mostly needed for flat-manager-client. # Build packages. Mostly needed for flat-manager-client.
@ -30,7 +30,7 @@ declare -a FLATPAK_PACKAGES=(
"org.kde.Platform/${ARCH}/${KDE_BRANCH}" "org.kde.Platform/${ARCH}/${KDE_BRANCH}"
"org.kde.Sdk/${ARCH}/${KDE_BRANCH}" "org.kde.Sdk/${ARCH}/${KDE_BRANCH}"
"org.freedesktop.Platform.ffmpeg-full/${ARCH}/${BRANCH}" "org.freedesktop.Platform.ffmpeg-full/${ARCH}/${BRANCH}"
"org.freedesktop.Sdk.Extension.llvm16/${ARCH}/${BRANCH}" "org.freedesktop.Sdk.Extension.llvm17/${ARCH}/${BRANCH}"
"org.freedesktop.appstream-glib/${ARCH}/stable" "org.freedesktop.appstream-glib/${ARCH}/stable"
) )

2
cmake/SearchForStuff.cmake
View File

@ -156,7 +156,7 @@ disable_compiler_warnings_for_target(cubeb)
disable_compiler_warnings_for_target(speex) disable_compiler_warnings_for_target(speex)
# Find the Qt components that we need. # Find the Qt components that we need.
find_package(Qt6 6.5.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets Network LinguistTools REQUIRED) find_package(Qt6 6.6.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets Network LinguistTools REQUIRED)
if(WIN32) if(WIN32)
add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)