From 806986132b77aaa68521e84f4ab08d879275bbf6 Mon Sep 17 00:00:00 2001 From: Mary Date: Fri, 4 Mar 2022 22:52:10 +0100 Subject: [PATCH] Merge ryujinx.yml in org.ryujinx.Ryujinx.yml --- org.ryujinx.Ryujinx.yml | 49 ++++++++++++++++++++++++++++++++++++++++- ryujinx.yml | 47 --------------------------------------- 2 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 ryujinx.yml diff --git a/org.ryujinx.Ryujinx.yml b/org.ryujinx.Ryujinx.yml index 236fc74..a7d5af2 100644 --- a/org.ryujinx.Ryujinx.yml +++ b/org.ryujinx.Ryujinx.yml @@ -26,4 +26,51 @@ finish-args: rename-icon: ryujinx command: ryujinx-wrapper modules: - - ryujinx.yml + - name: Ryujinx + buildsystem: simple + build-options: + append-path: /usr/lib/sdk/dotnet6/bin + append-ld-library-path: /usr/lib/sdk/dotnet6/lib + arch: + x86_64: + env: + RUNTIME: linux-x64 + env: + PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig + DOTNET_CLI_TELEMETRY_OPTOUT: 'true' + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' + + RYUJINX_VERSION: "1.1.56" + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "flathub" + RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "org.ryujinx.Ryujinx" + RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master" + build-commands: + - | + export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD) + 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 --self-contained --source nuget-sources + cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.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: + - nuget_sources.json + - type: git + url: https://github.com/Ryujinx/Ryujinx.git + commit: ac21abbb9d23432879b1026eb5bc48ad3d4583d8 + - type: file + path: ryujinx-wrapper + - type: file + path: org.ryujinx.Ryujinx.appdata.xml + diff --git a/ryujinx.yml b/ryujinx.yml deleted file mode 100644 index b915765..0000000 --- a/ryujinx.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Ryujinx -buildsystem: simple -build-options: - append-path: /usr/lib/sdk/dotnet6/bin - append-ld-library-path: /usr/lib/sdk/dotnet6/lib - arch: - x86_64: - env: - RUNTIME: linux-x64 - env: - PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig - DOTNET_CLI_TELEMETRY_OPTOUT: 'true' - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' - - RYUJINX_VERSION: "1.1.56" - RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "flathub" - RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "org.ryujinx.Ryujinx" - RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master" -build-commands: - - | - export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD) - 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 --self-contained --source nuget-sources - cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.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 -m644 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: - - nuget_sources.json - - type: git - url: https://github.com/Ryujinx/Ryujinx.git - commit: ac21abbb9d23432879b1026eb5bc48ad3d4583d8 - - type: file - path: ryujinx-wrapper - - type: file - path: org.ryujinx.Ryujinx.appdata.xml