RYUJINX: icenine's PR + removed mine

Merge pull request #222 from icenine451/cooker-0.6.0b-icenine451
This commit is contained in:
XargonWan 2022-12-01 17:41:58 +01:00 committed by GitHub
commit 3da97b8b99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 100 additions and 96 deletions

View file

@ -924,89 +924,22 @@ modules:
# Yes, this is old, do not update as we need libespol.so.1
- name: Cemu-binary
buildsystem: simple
build-commands:
- mv Cemu ${FLATPAK_DEST}/bin/Cemu
- chmod 777 ${FLATPAK_DEST}/bin/Cemu
- mkdir -p ${FLATPAK_DEST}/config/cemu
- mv gameProfiles ${FLATPAK_DEST}/config/cemu/gameProfiles
- mv resources ${FLATPAK_DEST}/config/cemu/resources
- mv shaderCache ${FLATPAK_DEST}/config/cemu/shaderCache
sources:
- type: archive
url: https://github.com/cemu-project/Cemu/releases/download/v2.0-10/cemu-2.0-10-ubuntu-20.04-x64.zip
sha256: b6cb5560e9a15be5991db4ca0ce1de70d233d094e388477b05d663a542dbbd5c
#- name: Cemu-binary
# buildsystem: simple
# build-commands:
# - mv Cemu ${FLATPAK_DEST}/bin/Cemu
# - chmod 777 ${FLATPAK_DEST}/bin/Cemu
# - mkdir -p ${FLATPAK_DEST}/config/cemu
# - mv gameProfiles ${FLATPAK_DEST}/config/cemu/gameProfiles
# - mv resources ${FLATPAK_DEST}/config/cemu/resources
# - mv shaderCache ${FLATPAK_DEST}/config/cemu/shaderCache
# sources:
# - type: archive
# url: https://github.com/cemu-project/Cemu/releases/download/v2.0-10/cemu-2.0-10-ubuntu-20.04-x64.zip
# sha256: b6cb5560e9a15be5991db4ca0ce1de70d233d094e388477b05d663a542dbbd5c
# Cemu - END
# Ryujinx - START
# NOTE: if this module is not the last one (before RetroDECK) it will break
# https://ryujinx.org/download
- name: Ryujinx
buildsystem: simple
build-options:
no-debuginfo: true
no-debuginfo-compression: true,
strip: false
arch:
x86_64:
env:
RUNTIME: linux-x64
env:
PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true'
RYUJINX_VERSION: 1.1.398
RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub
RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx
RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master
build-commands:
- |
export PATH=$PATH:/run/build/Ryujinx/dotnet-sdk
export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD)
export RUNTIME_FRAMEWORK_VERSION=$(find nuget-sources -name 'microsoft.netcore.app.host.linux-x64.*' | grep -oP '(\d.\d.\d+.nupkg)' | grep -oP '(\d.\d.\d+)')
sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs
mkdir -p /app/bin
dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER /p:RuntimeFrameworkVersion=$RUNTIME_FRAMEWORK_VERSION --self-contained --source nuget-sources
if [ $? -ne 0 ]; then
exit 1;
fi;
cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net7.0/$RUNTIME/publish/* /app/bin/
mkdir -p /app/lib/ffmpeg
ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml
install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg
install -Dm644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml
install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop
desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop
sources:
- type: archive
only-arches:
- x86_64
dest: dotnet-sdk
url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0.100/dotnet-sdk-7.0.100-linux-x64.tar.gz
sha256: 5d4a58eeca1a4ab095b55e6486b1278147b0ab121ce883b2bcde3d3626c9a81c
x-checker-data:
type: html
url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0/latest.version
version-pattern: ^([\d\.a-z-]+)$
url-template: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-x64.tar.gz
- rd-submodules/ryujinx/nuget_sources.json
- type: git
url: https://github.com/Ryujinx/Ryujinx.git
commit: a5c2aead6795192158caeb79e785543a15b5b2f4
# - type: file
# path: ryujinx-wrapper
# Ryujinx - END
# External manifests end
- name: retrodeck
@ -1062,3 +995,67 @@ modules:
- type: git
url: https://github.com/XargonWan/RetroDECK.git
branch: cooker-0.6.0b
# Ryujinx - START
# https://ryujinx.org/download
#
# THIS MUST BE AT THE END OF THE MANIFEST OR THE BINARY WILL GET CORRUPTED
#
- name: Ryujinx
buildsystem: simple
build-options:
no-debuginfo: true
no-debuginfo-compression: true
strip: false
arch:
x86_64:
env:
RUNTIME: linux-x64
env:
PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true'
RYUJINX_VERSION: 1.1.405
RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub
RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx
RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master
build-commands:
- |
export PATH=$PATH:/run/build/Ryujinx/dotnet-sdk
export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD)
export RUNTIME_FRAMEWORK_VERSION=$(find nuget-sources -name 'microsoft.netcore.app.host.linux-x64.*' | grep -oP '(\d.\d.\d+.nupkg)' | grep -oP '(\d.\d.\d+)')
sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs
sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs
mkdir -p /app/bin
dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER /p:RuntimeFrameworkVersion=$RUNTIME_FRAMEWORK_VERSION --self-contained --source nuget-sources
if [ $? -ne 0 ]; then
exit 1;
fi;
cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net7.0/$RUNTIME/publish/* /app/bin/
mkdir -p /app/lib/ffmpeg
ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
sources:
- type: git
url: https://github.com/Ryujinx/Ryujinx.git
commit: 458452279cee03bfe1bbf2c3daf3fc9722b03a74
- type: archive
only-arches:
- x86_64
dest: dotnet-sdk
url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0.100/dotnet-sdk-7.0.100-linux-x64.tar.gz
sha256: 5d4a58eeca1a4ab095b55e6486b1278147b0ab121ce883b2bcde3d3626c9a81c
x-checker-data:
type: html
url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0/latest.version
version-pattern: ^([\d\.a-z-]+)$
url-template: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-x64.tar.gz
- rd-submodules/ryujinx/nuget_sources.json
- type: file
path: rd-submodules/ryujinx/ryujinx-wrapper
# Ryujinx - END

View file

@ -293,6 +293,13 @@
"dest": "nuget-sources",
"dest-filename": "system.io.filesystem.primitives.4.3.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/system.codedom/7.0.0/system.codedom.7.0.0.nupkg",
"sha512": "eb3d7dece2b09817d0e3606f8a2c0e0e94a0fc928f18ae5dd7d5c768606f01fe75c9d70d047c8f44f0ade90a133c77c00f9bce6cb88f09902a9d503ab2cbccc3",
"dest": "nuget-sources",
"dest-filename": "system.codedom.7.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg",
@ -300,13 +307,6 @@
"dest": "nuget-sources",
"dest-filename": "system.codedom.4.4.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/system.codedom/6.0.0/system.codedom.6.0.0.nupkg",
"sha512": "2b911b7c9bc524c86562a26547dfc92a8c774ed5937993a4a22e8a9ca1b146151aeaeaf15e4271ff6fe6cf20af634815aa1485a5a4c48d24acf39b2a6bc3cf27",
"dest": "nuget-sources",
"dest-filename": "system.codedom.6.0.0.nupkg"
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg",
@ -918,10 +918,10 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/system.management/6.0.0/system.management.6.0.0.nupkg",
"sha512": "d98847c56d026a1cb6bac6b2dfb34aa9976b86754217eb80063cda76c391dee54a0f1accf19e1a76dedb7e1c63f815bcbb6c81380a76f8bd4c58680773601a43",
"url": "https://api.nuget.org/v3-flatcontainer/system.management/7.0.0/system.management.7.0.0.nupkg",
"sha512": "d0469d2a5ed07e7345ce759276c92cf30bb9d5680db68e1613917793d698dd1db8301361fb33970bae77ad0f506d1ae7a56f96ea0b5d854d352f58e69bbbda7f",
"dest": "nuget-sources",
"dest-filename": "system.management.6.0.0.nupkg"
"dest-filename": "system.management.7.0.0.nupkg"
},
{
"type": "file",
@ -953,10 +953,10 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.2/newtonsoft.json.12.0.2.nupkg",
"sha512": "9adc1e0573d6869d42310013b414fb65f319adb6414ca7e31b0cfa63be4dc068f1fc6ced0da5277f0f062bd299d93e1f0c8a8a2720e373d471970e7e1b615c54",
"url": "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg",
"sha512": "83731b662eaf05379a23f8446ef47bbc111349dd4358b7bd8b51383fe9cf637e2fe62f78cea52a0d7bdd582dc6fbbb5837d4a7b1d53dcf37a0ae7473e21ee7b1",
"dest": "nuget-sources",
"dest-filename": "newtonsoft.json.12.0.2.nupkg"
"dest-filename": "newtonsoft.json.13.0.1.nupkg"
},
{
"type": "file",
@ -1289,10 +1289,10 @@
},
{
"type": "file",
"url": "https://api.nuget.org/v3-flatcontainer/discordrichpresence/1.0.175/discordrichpresence.1.0.175.nupkg",
"sha512": "487c16a74a849a6998a025bf1c21e9c3b5a5aba874ecada16db3f653c7e55f9818e70cc097765baf432b902037c932bc0cbd229e33f03366f5e624aade40c3fb",
"url": "https://api.nuget.org/v3-flatcontainer/discordrichpresence/1.1.3.18/discordrichpresence.1.1.3.18.nupkg",
"sha512": "5fac6c07258c494fdb2f50e1c56ce3d4a4c8a76668be562fcd1858bd49678b581e419bbf4d9391baea9163827f99b32a21baa2bd78cd92a735af21a6add14e63",
"dest": "nuget-sources",
"dest-filename": "discordrichpresence.1.0.175.nupkg"
"dest-filename": "discordrichpresence.1.1.3.18.nupkg"
},
{
"type": "file",

View file

@ -0,0 +1,7 @@
#!/bin/sh
for i in {0..9}; do
test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
done
Ryujinx "$@"