Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-22 14:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/cooker-0.5.3b' into cooker-fixes

Browse source
This commit is contained in:
icenine451 2022-10-21 15:01:15 -04:00
parent 89992be641 78d7503ce5
commit cd5735a2b1
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -34,7 +34,7 @@ No, RetroDECK doesn't support Windows, but the project is fully open source so y
## How can I install it? ## How can I install it?
Just install it from Discover store.<br/> Just install it from Discover store.<br/>
However if you want to test the cooker version you can follow the [Installation instructions](https://github.com/XargonWan/RetroDECK/wiki#installation-instructions) on the Wiki However if you want to test the cooker version you can follow the [Installation instructions](https://github.com/XargonWan/RetroDECK/wiki/How-to:-Getting-started) on the Wiki
## Can I help? ## Can I help?
Of course, any help is appreciated, and not only by programming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)! Of course, any help is appreciated, and not only by programming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)!

23
net.retrodeck.retrodeck.yml
View file

@ -76,7 +76,7 @@ modules:
- | - |
git checkout ${GITHUB_REF_NAME} git checkout ${GITHUB_REF_NAME}
mkdir -p ${FLATPAK_DEST}/retrodeck/ mkdir -p ${FLATPAK_DEST}/retrodeck/
VERSION="0.6.0b-cooker" VERSION="0.5.2b"
if [[ $VERSION == *"cooker"* ]]; if [[ $VERSION == *"cooker"* ]];
then then
VERSION="cooker-"$(git rev-parse --short HEAD) VERSION="cooker-"$(git rev-parse --short HEAD)
@ -86,7 +86,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/XargonWan/RetroDECK.git url: https://github.com/XargonWan/RetroDECK.git
branch: cooker branch: main
- name: xmlstarlet - name: xmlstarlet
config-opts: config-opts:
@ -587,12 +587,13 @@ modules:
sources: sources:
- type: archive - type: archive
url: >- url: >-
https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2
sha256: 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 sha256: 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
x-checker-data: x-checker-data:
type: anitya type: anitya
project-id: 6845 project-id: 6845
url-template: https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_79_0.tar.bz2 url-template: >-
https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_80_0.tar.bz2
- name: nv-codec-headers - name: nv-codec-headers
make-install-args: make-install-args:
- PREFIX=/app - PREFIX=/app
@ -619,8 +620,8 @@ modules:
- -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
- -DYUZU_USE_QT_WEB_ENGINE=ON - -DYUZU_USE_QT_WEB_ENGINE=ON
- -DYUZU_USE_BUNDLED_FFMPEG=ON - -DYUZU_USE_BUNDLED_FFMPEG=ON
- -DDISPLAY_VERSION=1150 - -DDISPLAY_VERSION=1195
- -DBUILD_TAG=mainline-1150 - -DBUILD_TAG=mainline-1195
- -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline
#- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2 #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2
build-options: build-options:
@ -635,11 +636,11 @@ modules:
- install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher
- install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg - install -Dm644 ../dist/yuzu.svg /app/share/icons/hicolor/scalable/apps/yuzu.svg
sources: sources:
- disable-submodules: true # FLATHUB WORKAROUND #- disable-submodules: true # FLATHUB WORKAROUND
- type: git - type: git
url: https://github.com/yuzu-emu/yuzu-mainline.git url: https://github.com/yuzu-emu/yuzu-mainline.git
tag: mainline-0-1171 tag: mainline-0-1195
commit: 3b25d1fe22f5eee7a046432884d78b25a3950988 commit: 04db31a25a51f2daa296776eb4e58496ee74d49e
disable-shallow-clone: true disable-shallow-clone: true
x-checker-data: x-checker-data:
type: git type: git
@ -1432,4 +1433,4 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/XargonWan/RetroDECK.git url: https://github.com/XargonWan/RetroDECK.git
branch: cooker branch: main