From de0dca62dbfda365806262d981afe61f563971f5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 12 Dec 2023 09:04:21 +0100 Subject: [PATCH 1/2] RPCS3: updated + updated llvm (16 -> 17) + runtime (6.5 -> 6.6) --- net.retrodeck.retrodeck.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index e9341c41..4aa2129d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1,11 +1,11 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform -runtime-version: "6.5" +runtime-version: "6.6" sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm16 # Needed for rpcs3 (llvm15) but llvm16 for CITRA + - org.freedesktop.Sdk.Extension.llvm17 # Needed for rpcs3 (llvm17) but llvm16 for CITRA # base: io.qt.qtwebengine.BaseApp # Needed for Yuzu - Disabled as we're using AppImage for Yuzu -# base-version: "6.5" # Needed for Yuzu - Disabled as we're using AppImage for Yuzu +# base-version: "6.6" # Needed for Yuzu - Disabled as we're using AppImage for Yuzu command: retrodeck.sh add-extensions: @@ -958,8 +958,8 @@ modules: buildsystem: cmake-ninja builddir: true build-options: - append-ld-library-path: /usr/lib/sdk/llvm16/lib - append-path: /usr/lib/sdk/llvm16/bin + append-ld-library-path: /usr/lib/sdk/llvm17/lib + append-path: /usr/lib/sdk/llvm17/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 @@ -985,7 +985,7 @@ modules: - -DUSE_SYSTEM_ZLIB=ON - -Wno-dev post-install: - - cp /usr/lib/sdk/llvm16/lib/libLLVM-16.so /app/lib/ + - cp /usr/lib/sdk/llvm17/lib/libLLVM-17.so /app/lib/ - |- set -eux COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)" @@ -994,7 +994,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: 75d239356a773b8211354049477d79006597505e + commit: ab6bcd32a99eaf7eac37de303ff2cfd71ebee799 # RPCS3 - END From 2db684ec6510179d3ee17254c92f876a248157de Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 12 Dec 2023 09:34:12 +0100 Subject: [PATCH 2/2] FFMPEG: updated to 6.1 (was 5.1.1) --- 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 4aa2129d..ab4aa504 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -350,7 +350,7 @@ modules: sources: - type: git url: https://github.com/FFmpeg/FFmpeg.git - tag: n5.1.1 + tag: n6.1 - name: freeimage no-autogen: true