From b3b7ee7500a3d5241a05fa50a7a3150ceeca684b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 29 Apr 2024 19:40:34 +0200 Subject: [PATCH 1/9] MANIFEST: updating runtime version to 6.7 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2b2cdf04..1069b4be 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,6 +1,6 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -runtime-version: "6.5" +runtime-version: "6.7" sdk: org.kde.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.llvm16 # Needed for RPCS3 (llvm17 actually) From 7675568a2c71957e2dbc69521643df89ba6dbc23 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 2 May 2024 13:52:52 +0200 Subject: [PATCH 2/9] MANIFEST: updated ffmpeg to n5.1.4 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1069b4be..8de71416 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -372,7 +372,7 @@ modules: sources: - type: git url: https://github.com/FFmpeg/FFmpeg.git - tag: n5.1.1 + tag: n5.1.4 - name: freeimage no-autogen: true From 4b95340b0c3a9c7723f51bfa3f137f9a32299f78 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 2 May 2024 15:43:06 +0200 Subject: [PATCH 3/9] DOLPHIN: updated to 5.0-21264 (6.7 runtime support) --- net.retrodeck.retrodeck.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8de71416..58a0ab63 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -701,7 +701,6 @@ modules: # https://github.com/flathub/org.DolphinEmu.dolphin-emu # WHEN UPADTING: remember to update rd-submodules/dolphin contents - # needed for screensaver inhibition - name: xdg-screensaver-shim buildsystem: meson sources: @@ -728,7 +727,7 @@ modules: # fatal: remote transport reported error # url: ssh://git@github.com/dolphin-emu/dolphin.git url: https://github.com/dolphin-emu/dolphin.git - commit: 032c77b462a220016f23c5079e71bb23e0ad2adf + commit: 1efda863e47b690f460f069502a4391b3c7d87c4 x-checker-data: type: json url: https://dolphin-emu.org/update/latest/beta From 9c9587622d85ade88aab6cbd04fe4e07a645ff52 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 18 Jun 2024 16:37:27 +0900 Subject: [PATCH 4/9] PRIMEHACK: updated to PR 116 --- net.retrodeck.retrodeck.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 229c52ec..0ad75e63 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -902,7 +902,7 @@ modules: # RPCS3 - END - # PRIMEHACK - START - FROZEN UNTIL KDE 6.7 UPDATE + # PRIMEHACK - START # https://github.com/flathub/io.github.shiiion.primehack - name: primehack @@ -913,17 +913,14 @@ modules: - -DENABLE_SDL=ON - -DENABLE_EVDEV=ON - -DDISTRIBUTOR=Flathub - - -DQT_DIR= cleanup: - /share/man post-install: - install -D primehack-wrapper /app/bin/primehack-wrapper sources: - type: git - url: https://github.com/XargonWan/primehack - commit: af7710ef7b04a632b4294eae5e0eff8fe9c4d1f8 - #url: https://github.com/TheDrifter363/primehack.git - #commit: 6295c695307a67f11ee202b05cbdd7b5c1edae5c + url: https://github.com/shiiion/dolphin.git + commit: 81bfb9686afd2d190134b44dd72d3cee876fe2ab # This commit refers to the PR 166: https://github.com/shiiion/dolphin/pull/166, please change it when it's approved # detects whether dolphin is running in a flatpak sandbox # and makes it use xdg directories if it is. # prevents dolphin from attempting to write conf files @@ -942,7 +939,7 @@ modules: - primehack "$@" dest-filename: primehack-wrapper - # # PRIMEHACK - END + # PRIMEHACK - END # Duckstation-AppImage - START - AUTOUPDATED # https://github.com/stenzek/duckstation/releases/tag/preview From adb5a82b36e5dea637dd7b5f8d022ac740794949 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 18 Jun 2024 16:39:53 +0900 Subject: [PATCH 5/9] RPCS3: updated --- net.retrodeck.retrodeck.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 0ad75e63..09c99603 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -3,7 +3,7 @@ runtime: org.kde.Platform runtime-version: "6.7" sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm16 # Needed for RPCS3 (llvm17 actually) + - org.freedesktop.Sdk.Extension.llvm18 # Needed for RPCS3 - org.freedesktop.Sdk.Extension.rust-stable # Needed for BoilR command: retrodeck.sh @@ -858,11 +858,8 @@ modules: buildsystem: cmake-ninja builddir: true build-options: - # llvm17 is not available in framework 6.5 but in 6.6, so we're trying llvm16 and cross our fingers until Primehack is updated (as Primehack breaks on 6.6) - #append-ld-library-path: /usr/lib/sdk/llvm17/lib - #append-path: /usr/lib/sdk/llvm17/bin - append-ld-library-path: /usr/lib/sdk/llvm16/lib - append-path: /usr/lib/sdk/llvm16/bin + append-ld-library-path: /usr/lib/sdk/llvm18/lib + append-path: /usr/lib/sdk/llvm18/bin cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer @@ -888,8 +885,7 @@ modules: - -DUSE_SYSTEM_ZLIB=ON - -Wno-dev post-install: - #- cp /usr/lib/sdk/llvm17/lib/libLLVM-17.so /app/lib/ - - cp /usr/lib/sdk/llvm16/lib/libLLVM-16.so /app/lib/ + - cp /usr/lib/sdk/llvm18/lib/libLLVM.so.18.1 /app/lib/ - |- set -eux COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)" @@ -898,7 +894,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: 4ecf8ecd06c15f0557e1d9243f31e4c2d7baebe2 + commit: 5b973448bf75a239f34fd9c7698c8a02b04e2ea9 # RPCS3 - END From 6418d2ce37e7b4b70e2501ed5a2afa414faf7145 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 18 Jun 2024 16:41:55 +0900 Subject: [PATCH 6/9] DOLPHIN: updated --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 09c99603..35706b0c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -686,7 +686,7 @@ modules: # PCSX2 - END - # Dolphin - START - FROZEN UNTIL KDE 6.7 UPDATE + # Dolphin - START # https://github.com/flathub/org.DolphinEmu.dolphin-emu # WHEN UPADTING: remember to update rd-submodules/dolphin contents @@ -716,7 +716,7 @@ modules: # fatal: remote transport reported error # url: ssh://git@github.com/dolphin-emu/dolphin.git url: https://github.com/dolphin-emu/dolphin.git - commit: 1efda863e47b690f460f069502a4391b3c7d87c4 + commit: a9544510468740b77cf06ef28daaa65fe247fd32 x-checker-data: type: json url: https://dolphin-emu.org/update/latest/beta From 131e6a5b0fafdcf6b1b1a3d47f8b54da7116c865 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 18 Jun 2024 16:42:19 +0900 Subject: [PATCH 7/9] Comments cleanup --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 35706b0c..de23b2a3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -851,7 +851,7 @@ modules: # MELONDS - END - # RPCS3 - START - FROZEN UNTIL KDE 6.7 UPDATE + # RPCS3 - START # https://github.com/flathub/net.rpcs3.RPCS3 - name: rpcs3 From 45bcadfe7c888d070d951e599e7a1ce4c356d0db Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 18 Jun 2024 17:15:41 +0900 Subject: [PATCH 8/9] Triggering build From 222ce9d88ba7a6afd94878ba6435083c5ccbb30c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 19 Jun 2024 09:18:02 +0900 Subject: [PATCH 9/9] PRIMEHACK: updated patches --- rd-submodules/primehack/detectflatpak.patch | 3 +-- rd-submodules/primehack/nodirtyversion.patch | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/rd-submodules/primehack/detectflatpak.patch b/rd-submodules/primehack/detectflatpak.patch index 60dd1a2d..9c744da5 100644 --- a/rd-submodules/primehack/detectflatpak.patch +++ b/rd-submodules/primehack/detectflatpak.patch @@ -30,5 +30,4 @@ index 8d9dc2abb8..8a9d39a3d5 100644 const char* data_home = getenv("XDG_DATA_HOME"); std::string data_path = -- -2.37.1 - +2.37.1 \ No newline at end of file diff --git a/rd-submodules/primehack/nodirtyversion.patch b/rd-submodules/primehack/nodirtyversion.patch index 20b6f3c1..8d8482e3 100644 --- a/rd-submodules/primehack/nodirtyversion.patch +++ b/rd-submodules/primehack/nodirtyversion.patch @@ -1,13 +1,12 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9af66009a1..2acd3bed9a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -149,7 +149,7 @@ if(GIT_FOUND) +diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake +index aacf7491ce..503791cda8 100644 +--- a/CMake/ScmRevGen.cmake ++++ b/CMake/ScmRevGen.cmake +@@ -7,7 +7,7 @@ if(GIT_FOUND) OUTPUT_VARIABLE DOLPHIN_WC_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) # defines DOLPHIN_WC_DESCRIBE - execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty + execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE - OUTPUT_STRIP_TRAILING_WHITESPACE) - + OUTPUT_STRIP_TRAILING_WHITESPACE) \ No newline at end of file