cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ruffle: nightly-2023-04-10 -> nightly-2024-02-09

Browse source
This commit is contained in:
John Chadwick 2024-01-20 20:40:06 -05:00
parent 4441de75cb
commit dfbb330b7b
3 changed files with 2783 additions and 1441 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4021
pkgs/applications/emulators/ruffle/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

31
pkgs/applications/emulators/ruffle/default.nix
View file

@ -15,17 +15,18 @@
, wrapGAppsHook
, gsettings-desktop-schemas
, glib
, libxkbcommon
}:
rustPlatform.buildRustPackage rec {
pname = "ruffle";
version = "nightly-2023-04-10";
version = "nightly-2024-02-09";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = pname;
rev = version;
sha256 = "sha256-u5Ri9KnYzE3JedUP9fGgYeG8G9uxrL6/zt3KPiKjhU0=";
hash = "sha256-C4wfR5io0FBFmNfYHlE/v81jQAb0SEoaCzI6tenRYGg=";
};
nativeBuildInputs = [
@ -55,6 +56,12 @@ rustPlatform.buildRustPackage rec {
dontWrapGApps = true;
preFixup = ''
patchelf $out/bin/ruffle_desktop \
--add-needed libxkbcommon-x11.so \
--add-rpath ${libxkbcommon}/lib
'';
postFixup = ''
# This name is too generic
mv $out/bin/exporter $out/bin/ruffle_exporter
@ -73,29 +80,23 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--workspace" ];
# Currently, buildRustPackage can't handle having both the Crates.io dasp-0.11
# and the git dasp-0.11, as it tries to symlink both to the same place. For
# now, unify both dasp versions to the (newer) Git version.
# Related issues: #22177, #183344
cargoPatches = [ ./unify-dasp-version.patch ];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"dasp-0.11.0" = "sha256-CZNgTLL4IG7EJR2xVp9X9E5yre8foY6VX2hUMRawxiI=";
"flash-lso-0.5.0" = "sha256-9uH3quxRzLtmHJs5WF/GRxWkXL/KFyOl182HKcHNnuc=";
"gc-arena-0.2.2" = "sha256-/H9VcTesBD+IA7bUf208b0HQ/cIUDAz9TJBBywf6akA=";
"h263-rs-0.1.0" = "sha256-4kBg09VHyiQTvUbvcTb5g/BVcOpRFZ1fVEuRWXv5XwE=";
"flash-lso-0.6.0" = "sha256-SHWIOVp3MGIATKDKAGNWG3B3jX3a0jDE2c8bt7NptrE=";
"h263-rs-0.1.0" = "sha256-Akf1SBjo8qikhiHI8NPvO3vJvVfm0dQBf2X9V7OdgQc=";
"jpegxr-0.3.0" = "sha256-jirUbse2MiUDCmwBO7ykWNKHgDgL/6ZM5o2HeDUhm0c=";
"nellymoser-rs-0.1.2" = "sha256-GykDQc1XwySOqfxW/OcSxkKCFJyVmwSLy/CEBcwcZJs=";
"nihav_codec_support-0.1.0" = "sha256-rE9AIiQr+PnHC9xfDQULndSfFHSX4sqKkCAQYVNaJcQ=";
"nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c=";
};
};
meta = with lib; {
description = "An Adobe Flash Player emulator written in the Rust programming language.";
description = "An Adobe Flash Player emulator written in the Rust programming language";
homepage = "https://ruffle.rs/";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ govanify ];
maintainers = with maintainers; [ govanify jchw ];
platforms = platforms.linux;
mainProgram = "ruffle_desktop";
};
}

172
pkgs/applications/emulators/ruffle/unify-dasp-version.patch
View file

@ -1,172 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 09a084648..047210eac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -812,7 +812,7 @@ dependencies = [
"alsa",
"core-foundation-sys 0.8.4",
"coreaudio-rs",
- "dasp_sample 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dasp_sample",
"jni 0.19.0",
"js-sys",
"libc",
@@ -1068,7 +1068,7 @@ dependencies = [
[[package]]
name = "dasp"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
"dasp_envelope",
"dasp_frame",
@@ -1076,7 +1076,7 @@ dependencies = [
"dasp_peak",
"dasp_ring_buffer",
"dasp_rms",
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
"dasp_signal",
"dasp_slice",
"dasp_window",
@@ -1085,72 +1085,66 @@ dependencies = [
[[package]]
name = "dasp_envelope"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
"dasp_frame",
"dasp_peak",
"dasp_ring_buffer",
"dasp_rms",
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
]
[[package]]
name = "dasp_frame"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
]
[[package]]
name = "dasp_interpolate"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
"dasp_frame",
"dasp_ring_buffer",
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
]
[[package]]
name = "dasp_peak"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
"dasp_frame",
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
]
[[package]]
name = "dasp_ring_buffer"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
[[package]]
name = "dasp_rms"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
"dasp_frame",
"dasp_ring_buffer",
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
]
[[package]]
name = "dasp_sample"
version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
-
-[[package]]
-name = "dasp_sample"
-version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
[[package]]
name = "dasp_signal"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
"dasp_envelope",
"dasp_frame",
@@ -1158,25 +1152,25 @@ dependencies = [
"dasp_peak",
"dasp_ring_buffer",
"dasp_rms",
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
"dasp_window",
]
[[package]]
name = "dasp_slice"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
"dasp_frame",
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
]
[[package]]
name = "dasp_window"
version = "0.11.0"
-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94"
+source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94"
dependencies = [
- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)",
+ "dasp_sample",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index c3d25e662..fba44c9e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,3 +71,6 @@ inherits = "release"
[profile.web-wasm-extensions]
inherits = "release"
+
+[patch.crates-io]
+dasp_sample = { git = "https://github.com/RustAudio/dasp", rev = "f05a703d247bb504d7e812b51e95f3765d9c5e94" }
diff --git a/core/Cargo.toml b/core/Cargo.toml
index ef2210484..1123911d6 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -42,7 +42,7 @@ nellymoser-rs = { git = "https://github.com/ruffle-rs/nellymoser", rev = "4a3352
regress = "0.5"
flash-lso = { git = "https://github.com/ruffle-rs/rust-flash-lso", rev = "8376453eddddbe701031a091c0eed94068fa5649" }
lzma-rs = {version = "0.3.0", optional = true }
-dasp = { git = "https://github.com/RustAudio/dasp", rev = "f05a703", features = ["interpolate", "interpolate-linear", "signal"], optional = true }
+dasp = { git = "https://github.com/RustAudio/dasp", rev = "f05a703d247bb504d7e812b51e95f3765d9c5e94", features = ["interpolate", "interpolate-linear", "signal"], optional = true }
symphonia = { version = "0.5.2", default-features = false, features = ["mp3"], optional = true }
enumset = "1.0.12"
bytemuck = "1.13.1"