From 2019ed0e31392dc7a194989cc10b02b857ad245f Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Fri, 17 Jan 2025 16:49:36 -0600 Subject: [PATCH 1/4] Update FFmpeg runtimes to 6.1.2 Add runtimes for win-arm64 arch. --- Directory.Packages.props | 2 +- src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs | 4 ++-- src/Ryujinx/Ryujinx.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 62a642374..a36042b36 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,7 +39,7 @@ - + diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs index c31d3034e..1134b0c6b 100644 --- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs +++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs @@ -12,8 +12,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native private static readonly Dictionary _librariesWhitelist = new() { - { AvCodecLibraryName, (58, 59) }, - { AvUtilLibraryName, (56, 57) }, + { AvCodecLibraryName, (58, 61) }, + { AvUtilLibraryName, (56, 59) }, }; private static string FormatLibraryNameForCurrentOs(string libraryName, int version) diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj index 1f9642466..d061346ec 100644 --- a/src/Ryujinx/Ryujinx.csproj +++ b/src/Ryujinx/Ryujinx.csproj @@ -57,7 +57,7 @@ - + -- 2.47.1 From cd8ce1e2337fb19f93c03dbf83819d80b326dce6 Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Thu, 20 Feb 2025 17:11:46 -0600 Subject: [PATCH 2/4] Add win-arm64 to workflows --- .github/workflows/build.yml | 1 + .github/workflows/canary.yml | 2 ++ .github/workflows/release.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0472fd5f7..a70dcc6f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: configuration: [Debug, Release] platform: - { name: win-x64, os: windows-latest, zip_os_name: win_x64 } + - { name: win-arm64, os: windows-latest, zip_os_name: win_arm64 } - { name: linux-x64, os: ubuntu-latest, zip_os_name: linux_x64 } - { name: linux-arm64, os: ubuntu-latest, zip_os_name: linux_arm64 } - { name: osx-x64, os: macos-13, zip_os_name: osx_x64 } diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index fbd76a2d8..d92733723 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -62,6 +62,7 @@ jobs: | Platform | Artifact | |--|--| | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) | + | Windows ARM 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) | | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) | | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) | | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) | @@ -79,6 +80,7 @@ jobs: matrix: platform: - { name: win-x64, os: windows-latest, zip_os_name: win_x64 } + - { name: win-arm64, os: windows-latest, zip_os_name: win_arm64 } - { name: linux-x64, os: ubuntu-latest, zip_os_name: linux_x64 } - { name: linux-arm64, os: ubuntu-latest, zip_os_name: linux_arm64 } steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69e4dc216..8dd6b48d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,7 @@ jobs: matrix: platform: - { name: win-x64, os: windows-latest, zip_os_name: win_x64 } + - { name: win-arm64, os: windows-latest, zip_os_name: win_arm64 } - { name: linux-x64, os: ubuntu-latest, zip_os_name: linux_x64 } - { name: linux-arm64, os: ubuntu-latest, zip_os_name: linux_arm64 } steps: -- 2.47.1 From fcee6953b82342bb28458f64f009bd85ab7aa25f Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Sun, 23 Feb 2025 00:12:24 -0600 Subject: [PATCH 3/4] Disable trimming on win-arm64 * nuget: Bump System group to 9.0.2 * Clean up RuntimeIdentifiers in project files --- .github/workflows/canary.yml | 2 -- .github/workflows/release.yml | 1 - Directory.Packages.props | 4 ++-- src/ARMeilleure/ARMeilleure.csproj | 2 +- .../Ryujinx.Audio.Backends.SoundIo.csproj | 8 ++++---- src/Ryujinx/Ryujinx.csproj | 14 ++++++++++---- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index d92733723..28d996ea6 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -124,7 +124,6 @@ jobs: if: matrix.platform.os == 'windows-latest' run: | pushd publish - rm libarmeilleure-jitsupport.dylib 7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish popd shell: bash @@ -133,7 +132,6 @@ jobs: if: matrix.platform.os == 'ubuntu-latest' run: | pushd publish - rm libarmeilleure-jitsupport.dylib chmod +x Ryujinx.sh Ryujinx tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish popd diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8dd6b48d4..b43916e59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,7 +109,6 @@ jobs: if: matrix.platform.os == 'windows-latest' run: | pushd publish - rm libarmeilleure-jitsupport.dylib 7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish popd shell: bash diff --git a/Directory.Packages.props b/Directory.Packages.props index a36042b36..adf48c1de 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -53,8 +53,8 @@ - - + + diff --git a/src/ARMeilleure/ARMeilleure.csproj b/src/ARMeilleure/ARMeilleure.csproj index 5b6c5a6da..4226c68f1 100644 --- a/src/ARMeilleure/ARMeilleure.csproj +++ b/src/ARMeilleure/ARMeilleure.csproj @@ -11,7 +11,7 @@ - + PreserveNewest libarmeilleure-jitsupport.dylib diff --git a/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj b/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj index d06f66181..911401338 100644 --- a/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj +++ b/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj @@ -2,7 +2,7 @@ true - win-x64;osx-x64;linux-x64 + win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64 $(DefaultItemExcludes);._* @@ -11,15 +11,15 @@ - + PreserveNewest libsoundio.dll - + PreserveNewest libsoundio.dylib - + PreserveNewest libsoundio.so diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj index d061346ec..1e069329b 100644 --- a/src/Ryujinx/Ryujinx.csproj +++ b/src/Ryujinx/Ryujinx.csproj @@ -1,6 +1,6 @@ - win-x64;osx-x64;linux-x64 + win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64; Exe true 1.0.0-dirty @@ -29,12 +29,18 @@ partial + + true + false + + + true @@ -58,7 +64,7 @@ - + @@ -67,7 +73,7 @@ - + @@ -84,7 +90,7 @@ - + Always alsoft.ini -- 2.47.1 From 747e72125917968d8bd6eb6b5829501001e99d79 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Thu, 13 Mar 2025 15:00:11 -0500 Subject: [PATCH 4/4] switch back to old method of removing jitsupport dylib --- .github/workflows/canary.yml | 2 ++ .github/workflows/release.yml | 2 ++ src/ARMeilleure/ARMeilleure.csproj | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 28d996ea6..d92733723 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -124,6 +124,7 @@ jobs: if: matrix.platform.os == 'windows-latest' run: | pushd publish + rm libarmeilleure-jitsupport.dylib 7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish popd shell: bash @@ -132,6 +133,7 @@ jobs: if: matrix.platform.os == 'ubuntu-latest' run: | pushd publish + rm libarmeilleure-jitsupport.dylib chmod +x Ryujinx.sh Ryujinx tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish popd diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b43916e59..c8465625a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,6 +109,7 @@ jobs: if: matrix.platform.os == 'windows-latest' run: | pushd publish + rm libarmeilleure-jitsupport.dylib 7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish popd shell: bash @@ -117,6 +118,7 @@ jobs: if: matrix.platform.os == 'ubuntu-latest' run: | pushd publish + rm libarmeilleure-jitsupport.dylib chmod +x Ryujinx.sh Ryujinx tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish popd diff --git a/src/ARMeilleure/ARMeilleure.csproj b/src/ARMeilleure/ARMeilleure.csproj index 4226c68f1..5b6c5a6da 100644 --- a/src/ARMeilleure/ARMeilleure.csproj +++ b/src/ARMeilleure/ARMeilleure.csproj @@ -11,7 +11,7 @@ - + PreserveNewest libarmeilleure-jitsupport.dylib -- 2.47.1