diff --git a/native/Cargo.lock b/native/Cargo.lock index 9a8e9b64..1fe9b1b1 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -2,6 +2,22 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "ab_glyph" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + [[package]] name = "addr2line" version = "0.21.0" @@ -24,6 +40,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -112,9 +129,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fde6067df7359f2d6335ec1a50c1f8f825801687d10da0cc4c6b08e3f6afd15" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -170,12 +187,24 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + [[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + [[package]] name = "ash" version = "0.37.3+1.3.251" @@ -302,7 +331,7 @@ dependencies = [ [[package]] name = "build_playerglobal" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "clap", "colored", @@ -368,6 +397,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend", + "wayland-client", +] + [[package]] name = "cc" version = "1.0.83" @@ -481,10 +522,35 @@ dependencies = [ ] [[package]] -name = "com-rs" -version = "0.2.1" +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "combine" @@ -617,9 +683,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.7.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.4.2", "libloading 0.8.1", @@ -1030,7 +1096,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dec7592cd1f45c1afe9084ce59c62a3a7c266c125c4c2ec97e95b0563c4aa914" dependencies = [ - "flume 0.10.14", + "flume", "ignore", "once_cell", "proc-macro2", @@ -1051,7 +1117,7 @@ dependencies = [ "fluent-langneg", "fluent-syntax", "fluent-template-macros", - "flume 0.10.14", + "flume", "heck", "ignore", "intl-memoizer", @@ -1072,22 +1138,10 @@ dependencies = [ "spin", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin", -] - [[package]] name = "flv-rs" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "bitflags 2.4.2", "thiserror", @@ -1256,6 +1310,16 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" version = "0.2.12" @@ -1263,10 +1327,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1306,7 +1368,7 @@ dependencies = [ "bstr", "log", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] @@ -1351,11 +1413,10 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "backtrace", "log", "presser", "thiserror", @@ -1433,14 +1494,14 @@ dependencies = [ [[package]] name = "hassle-rs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 1.3.2", - "com-rs", + "bitflags 2.4.2", + "com", "libc", - "libloading 0.7.4", + "libloading 0.8.1", "thiserror", "widestring", "winapi", @@ -1469,7 +1530,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -1820,6 +1881,24 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +[[package]] +name = "memmap2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "metal" version = "0.27.0" @@ -1853,8 +1932,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.14.2" -source = "git+https://github.com/gfx-rs/wgpu?branch=v0.18#daedf03f0617aab6b3ab7380132dc9cb07f62d32" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" dependencies = [ "bit-set", "bitflags 2.4.2", @@ -1874,7 +1954,7 @@ dependencies = [ [[package]] name = "naga-agal" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "bitflags 2.4.2", "naga", @@ -1885,7 +1965,7 @@ dependencies = [ [[package]] name = "naga-pixelbender" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "anyhow", "bitflags 2.4.2", @@ -1897,9 +1977,9 @@ dependencies = [ [[package]] name = "naga_oil" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff3f369dd665ee365daeab786466a6f70ff53e4a95a76117363b1077e1b0492" +checksum = "86343242cc8fe7c38de0324f0c13a789729f3d360d98de12c464a815ad52feda" dependencies = [ "bit-set", "codespan-reporting", @@ -1908,22 +1988,13 @@ dependencies = [ "naga", "once_cell", "regex", - "regex-syntax 0.7.5", + "regex-syntax", "rustc-hash", "thiserror", "tracing", "unicode-ident", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "ndk" version = "0.8.0" @@ -1986,6 +2057,18 @@ dependencies = [ "nihav_core", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", +] + [[package]] name = "nom" version = "7.1.3" @@ -2135,9 +2218,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50b637ffd883b2733a8483599fb6136b9dcedaa1850f7ac08b9b6f9f2061208" +checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" dependencies = [ "aliasable", "ouroboros_macro", @@ -2146,9 +2229,9 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3633d65683f13b9bcfaa3150880b018899fb0e5d0542f4adaea4f503fdb5eabf" +checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" dependencies = [ "heck", "itertools 0.12.0", @@ -2158,6 +2241,15 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser", +] + [[package]] name = "parking" version = "2.2.0" @@ -2297,9 +2389,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2323,6 +2415,15 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + [[package]] name = "quick-xml" version = "0.31.0" @@ -2379,9 +2480,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "realfft" @@ -2412,33 +2513,27 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -2486,7 +2581,7 @@ dependencies = [ [[package]] name = "ruffle_core" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "async-channel", "bitflags 2.4.2", @@ -2516,7 +2611,7 @@ dependencies = [ "num-derive", "num-traits", "percent-encoding", - "quick-xml", + "quick-xml 0.31.0", "rand", "realfft", "regress", @@ -2543,7 +2638,7 @@ dependencies = [ [[package]] name = "ruffle_gc_arena" version = "0.0.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "gc-arena", ] @@ -2551,7 +2646,7 @@ dependencies = [ [[package]] name = "ruffle_macros" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "quote", "syn 2.0.48", @@ -2560,7 +2655,7 @@ dependencies = [ [[package]] name = "ruffle_render" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "byteorder", "downcast-rs", @@ -2587,7 +2682,7 @@ dependencies = [ [[package]] name = "ruffle_render_wgpu" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "bytemuck", "downcast-rs", @@ -2614,7 +2709,7 @@ dependencies = [ [[package]] name = "ruffle_video" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "generational-arena", "ruffle_render", @@ -2625,7 +2720,7 @@ dependencies = [ [[package]] name = "ruffle_video_software" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "flate2", "generational-arena", @@ -2644,7 +2739,7 @@ dependencies = [ [[package]] name = "ruffle_wstr" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" [[package]] name = "rustc-demangle" @@ -2719,12 +2814,31 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2", + "smithay-client-toolkit", + "tiny-skia", +] + [[package]] name = "self_cell" version = "0.10.3" @@ -2822,9 +2936,34 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" +dependencies = [ + "bitflags 2.4.2", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] [[package]] name = "smol_str" @@ -2868,12 +3007,11 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits", + "bitflags 2.4.2", ] [[package]] @@ -2894,6 +3032,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + [[package]] name = "strsim" version = "0.10.0" @@ -2903,7 +3047,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "swf" version = "0.2.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#9aff95316310cbd06f82a6026626d24c7dbf397d" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" dependencies = [ "bitflags 2.4.2", "bitstream-io 2.2.0", @@ -3071,6 +3215,31 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-skia" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + [[package]] name = "tinystr" version = "0.7.5" @@ -3361,6 +3530,115 @@ version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.2", + "nix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.2", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + [[package]] name = "weak-table" version = "0.3.2" @@ -3389,18 +3667,19 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu?branch=v0.18#daedf03f0617aab6b3ab7380132dc9cb07f62d32" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" dependencies = [ "arrayvec", "cfg-if", - "flume 0.11.0", + "cfg_aliases", "js-sys", "log", "naga", @@ -3419,15 +3698,19 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.18.1" -source = "git+https://github.com/gfx-rs/wgpu?branch=v0.18#daedf03f0617aab6b3ab7380132dc9cb07f62d32" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.4.2", + "cfg_aliases", "codespan-reporting", + "indexmap", "log", "naga", + "once_cell", "parking_lot", "profiling", "raw-window-handle", @@ -3441,8 +3724,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.18.1" -source = "git+https://github.com/gfx-rs/wgpu?branch=v0.18#daedf03f0617aab6b3ab7380132dc9cb07f62d32" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" dependencies = [ "android_system_properties", "arrayvec", @@ -3450,6 +3734,7 @@ dependencies = [ "bit-set", "bitflags 2.4.2", "block", + "cfg_aliases", "core-graphics-types", "d3d12", "glow", @@ -3483,8 +3768,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu?branch=v0.18#daedf03f0617aab6b3ab7380132dc9cb07f62d32" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" dependencies = [ "bitflags 2.4.2", "js-sys", @@ -3493,9 +3779,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +checksum = "b31891d644eba1789fb6715f27fbc322e4bdf2ecdc412ede1993246159271613" dependencies = [ "bytemuck", "safe_arch", @@ -3540,21 +3826,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-targets 0.48.5", + "windows-core", + "windows-targets 0.52.0", ] [[package]] @@ -3770,9 +4047,11 @@ version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" dependencies = [ + "ahash", "android-activity", "atomic-waker", "bitflags 2.4.2", + "bytemuck", "calloop", "cfg_aliases", "core-foundation", @@ -3782,21 +4061,31 @@ dependencies = [ "js-sys", "libc", "log", + "memmap2", "ndk", "ndk-sys", "objc2", "once_cell", "orbclient", + "percent-encoding", "raw-window-handle", "redox_syscall 0.3.5", "rustix", + "sctk-adwaita", + "smithay-client-toolkit", "smol_str", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", "web-sys", "web-time", "windows-sys 0.48.0", + "x11-dl", + "x11rb", "xkbcommon-dl", ] @@ -3809,6 +4098,44 @@ dependencies = [ "memchr", ] +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.1", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + [[package]] name = "xkbcommon-dl" version = "0.4.1" diff --git a/native/Cargo.toml b/native/Cargo.toml index c203b645..8f592242 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -18,13 +18,12 @@ android-activity = { version = "0.5.1", features = ["game-activity"] } android_logger = "0.13.3" jni = "0.21.1" -# rwh 0.6 is enabled by default, we're not there yet -ndk = { version = "0.8.0", features = ["audio"], default-features = false } +ndk = { version = "0.8.0", features = ["audio"] } ndk-context = "0.1.1" -winit = { version = "0.29.10", features = ["android-game-activity", "rwh_05"], default-features = false } -# Have to follow Ruffle with this. -wgpu = { git = "https://github.com/gfx-rs/wgpu", branch = "v0.18" } +# Have to follow Ruffle with these. +winit = { version = "0.29.10", features = ["android-game-activity"] } +wgpu = "0.19.1" ruffle_core = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master", features = [ "audio", @@ -35,6 +34,7 @@ ruffle_core = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "maste "default_compatibility_rules", "default_font", ] } + ruffle_render_wgpu = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master" } ruffle_video = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master" } ruffle_video_software = { git = "https://github.com/ruffle-rs/ruffle.git", branch = "master" } @@ -45,8 +45,3 @@ log-panics = { version = "2.1.0", features = ["with-backtrace"]} url = "2.5.0" generational-arena = "0.2.9" async-channel = "2.1.1" - -# Have to follow Ruffle with this. -[patch.crates-io] -wgpu = { git = "https://github.com/gfx-rs/wgpu", branch = "v0.18" } -naga = { git = "https://github.com/gfx-rs/wgpu", branch = "v0.18" } \ No newline at end of file diff --git a/native/src/lib.rs b/native/src/lib.rs index 84d18a10..8f52beff 100644 --- a/native/src/lib.rs +++ b/native/src/lib.rs @@ -15,6 +15,7 @@ use std::{ sync::{Arc, Mutex}, time::Instant, }; +use wgpu::rwh::{HasDisplayHandle, HasWindowHandle}; use android_activity::AndroidApp; use winit::{ @@ -194,14 +195,20 @@ fn run(event_loop: EventLoop, window: Window) { log::info!("playerbox is none"); //let size = window.inner_size(); - let renderer = WgpuRenderBackend::for_window( - &window, - (window.inner_size().width, window.inner_size().height), - wgpu::Backends::GL, - wgpu::PowerPreference::HighPerformance, - None, - ) - .unwrap(); + let renderer = unsafe { + // TODO: make this take an Arc instead? + WgpuRenderBackend::for_window_unsafe( + wgpu::SurfaceTargetUnsafe::RawHandle { + raw_display_handle: window.display_handle().unwrap().into(), + raw_window_handle: window.window_handle().unwrap().into(), + }, + (window.inner_size().width, window.inner_size().height), + wgpu::Backends::GL, + wgpu::PowerPreference::HighPerformance, + None, + ) + .unwrap() + }; let movie_url = Url::parse("file://movie.swf").unwrap(); let (executor, channel) = WinitAsyncExecutor::new(event_loop_proxy.clone()); @@ -277,15 +284,20 @@ fn run(event_loop: EventLoop, window: Window) { let player = unsafe { &playerbox.as_ref().unwrap().player }; let mut player_lock = player.lock().unwrap(); - player_lock - .renderer_mut() - .downcast_mut::>() - .unwrap() - .recreate_surface( - &window, - (window.inner_size().width, window.inner_size().height), - ); - + unsafe { + player_lock + .renderer_mut() + .downcast_mut::>() + .unwrap() + // TODO: make this take an Arc instead? + .recreate_surface_unsafe( + wgpu::SurfaceTargetUnsafe::RawHandle { + raw_display_handle: window.display_handle().unwrap().into(), + raw_window_handle: window.window_handle().unwrap().into(), + }, + (window.inner_size().width, window.inner_size().height), + ); + } player_lock.set_is_playing(true); } }