Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-01-17 22:35:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed rpcs3-llvm as llvm is already included in flatpak enviro - fix2

Browse source
This commit is contained in:
xargon 2022-06-14 11:02:08 +02:00
parent 18abb87c6a
commit c8a078fad5
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net.retrodeck.retrodeck.yml
View file

@ -4,7 +4,7 @@ runtime-version: '5.15-21.08'
sdk: org.kde.Sdk sdk: org.kde.Sdk
# Needed for rpcs3 # Needed for rpcs3
sdk-extensions: sdk-extensions:
- org.freedesktop.Sdk.Extension.llvm13 - org.freedesktop.Sdk.Extension.llvm14
# /Needed for rpcs3 # /Needed for rpcs3
# Needed for Yuzu # Needed for Yuzu
base: io.qt.qtwebengine.BaseApp base: io.qt.qtwebengine.BaseApp
@ -933,12 +933,12 @@ modules:
buildsystem: cmake-ninja buildsystem: cmake-ninja
builddir: true builddir: true
build-options: build-options:
append-ld-library-path: /usr/lib/sdk/llvm13/lib append-ld-library-path: /usr/lib/sdk/llvm14/lib
append-path: /usr/lib/sdk/llvm13/bin append-path: /usr/lib/sdk/llvm14/bin
cflags: *optflags # cflags: *optflags
cflags-override: true # cflags-override: true
cxxflags: *optflags # cxxflags: *optflags
cxxflags-override: true # cxxflags-override: true
env: env:
AR: llvm-ar AR: llvm-ar
CC: clang CC: clang
@ -958,11 +958,9 @@ modules:
post-install: post-install:
- | - |
set -eux; set -eux;
sed -i 's|<id>RPCS3</id>|<id>net.rpcs3.RPCS3</id>|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml;
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)";
COMM_COUNT="$(git rev-list --count HEAD)"; COMM_COUNT="$(git rev-list --count HEAD)";
COMM_HASH="$(git rev-parse --short=8 HEAD)"; COMM_HASH="$(git rev-parse --short=8 HEAD)";
sed -i 's|</component>|<content_rating type="oars-1.1"/><releases><release date="'$(git show -s --format=%cs)'" version="'"${COMM_TAG}"'-'"${COMM_COUNT}"'-'"${COMM_HASH}"'"/></releases></component>|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml;
sources: sources:
- type: git - type: git
url: https://github.com/RPCS3/rpcs3.git url: https://github.com/RPCS3/rpcs3.git