Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-25 15:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "RPCS3: updated [This may BREAK the manifest as is supposed to run on runtime 6.7]"

Browse source 
This reverts commit 555d2a5b46.
This commit is contained in:
XargonWan 2024-05-03 09:39:34 +02:00
parent 9c696a57f5
commit 80a7a01b86
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net.retrodeck.retrodeck.yml
View file

@ -3,7 +3,7 @@ runtime: org.kde.Platform
runtime-version: "6.5" runtime-version: "6.5"
sdk: org.kde.Sdk sdk: org.kde.Sdk
sdk-extensions: sdk-extensions:
- org.freedesktop.Sdk.Extension.llvm18 # Needed for RPCS3 - org.freedesktop.Sdk.Extension.llvm16 # Needed for RPCS3 (llvm17 actually)
- org.freedesktop.Sdk.Extension.rust-stable # Needed for BoilR - org.freedesktop.Sdk.Extension.rust-stable # Needed for BoilR
command: retrodeck.sh command: retrodeck.sh
@ -856,8 +856,11 @@ modules:
buildsystem: cmake-ninja buildsystem: cmake-ninja
builddir: true builddir: true
build-options: build-options:
append-ld-library-path: /usr/lib/sdk/llvm18/lib # 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-path: /usr/lib/sdk/llvm18/bin #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
cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
-grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
-fcf-protection -fno-omit-frame-pointer -fcf-protection -fno-omit-frame-pointer
@ -883,7 +886,8 @@ modules:
- -DUSE_SYSTEM_ZLIB=ON - -DUSE_SYSTEM_ZLIB=ON
- -Wno-dev - -Wno-dev
post-install: post-install:
- cp /usr/lib/sdk/llvm18/lib/libLLVM.so.18.1 /app/lib/ #- cp /usr/lib/sdk/llvm17/lib/libLLVM-17.so /app/lib/
- cp /usr/lib/sdk/llvm16/lib/libLLVM-16.so /app/lib/
- |- - |-
set -eux set -eux
COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)" COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"
@ -892,8 +896,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/RPCS3/rpcs3.git url: https://github.com/RPCS3/rpcs3.git
branch: master commit: 4ecf8ecd06c15f0557e1d9243f31e4c2d7baebe2
commit: f1ef3bdcd7e2b22ecce67705d931de6b43fb9a20
# RPCS3 - END # RPCS3 - END