From 709a97f5981cc6d70b0d978f848679fcfccb1c16 Mon Sep 17 00:00:00 2001 From: lifning <> Date: Sun, 17 Oct 2021 14:19:12 -0700 Subject: [PATCH] repo on cybre.tech --- Cargo.lock | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 11 +++--- 2 files changed, 107 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ecf8638..f2cf769 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,6 +38,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "c_vec" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30" + [[package]] name = "cc" version = "1.0.71" @@ -112,6 +118,12 @@ dependencies = [ "syn", ] +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + [[package]] name = "ferretro_base" version = "0.1.0" @@ -141,6 +153,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi", +] + [[package]] name = "gl" version = "0.14.0" @@ -179,6 +202,15 @@ dependencies = [ "libc", ] +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + [[package]] name = "khronos_api" version = "3.1.0" @@ -294,6 +326,12 @@ dependencies = [ "syn", ] +[[package]] +name = "ppv-lite86" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -353,9 +391,9 @@ checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ "autocfg 0.1.7", "libc", - "rand_chacha", + "rand_chacha 0.1.1", "rand_core 0.4.2", - "rand_hc", + "rand_hc 0.1.0", "rand_isaac", "rand_jitter", "rand_os", @@ -364,6 +402,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -374,6 +424,16 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.3", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -389,6 +449,15 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -398,6 +467,15 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rand_hc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core 0.6.3", +] + [[package]] name = "rand_isaac" version = "0.1.1" @@ -451,6 +529,15 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core 0.6.3", +] + [[package]] name = "rdrand" version = "0.4.0" @@ -467,10 +554,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b" dependencies = [ "bitflags", + "c_vec", "lazy_static", "libc", "num", - "rand", + "rand 0.6.5", "sdl2-sys", ] @@ -579,6 +667,12 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + [[package]] name = "winapi" version = "0.3.9" @@ -612,6 +706,9 @@ name = "zretro" version = "0.1.0" dependencies = [ "ferretro_components", + "itertools", + "rand 0.8.4", + "rand_xoshiro", "sdl2", "structopt", ] diff --git a/Cargo.toml b/Cargo.toml index 4625695..4d4b7a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,15 +4,18 @@ version = "0.1.0" authors = ["lifning"] edition = "2018" -[patch.'https://git.vvn.space/cinnabon/rustro'] +[patch.'https://cybre.tech/lifning/ferretro.git'] ferretro_base = { path = "../ferretro/ferretro_base" } ferretro_components = { path = "../ferretro/ferretro_components" } [dependencies.ferretro_components] -git = "https://git.vvn.space/cinnabon/rustro" -branch = "matriarch" +git = "https://cybre.tech/lifning/ferretro.git" +branch = "liffy/sdl2surf" features = ["sdl2_comp"] [dependencies] -sdl2 = { version = "0.32", features = ["image"] } +sdl2 = { version = "0.32", features = ["image", "gfx"] } structopt = "0.3" +itertools = "0.10" +rand = "0.8" +rand_xoshiro = "0.6"