From 7cfe34fe82fea52416a7f533bdd3782163656a35 Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Mon, 9 Oct 2023 09:56:54 +1100 Subject: [PATCH] move away from vendored deps --- .cargo/config | 6 ---- .cargo/config.toml | 11 ++++++ .gitmodules | 11 ------ Cargo.lock | 74 +++++++++++++++++++---------------------- Cargo.toml | 9 +++-- gb-vst/Cargo.toml | 4 +-- gb-vst/xtask/Cargo.toml | 3 +- lib/Cargo.toml | 2 +- vendored/ash-molten | 1 - vendored/baseview | 1 - vendored/nih-plug | 1 - 11 files changed, 53 insertions(+), 70 deletions(-) delete mode 100644 .cargo/config create mode 100644 .cargo/config.toml delete mode 160000 vendored/ash-molten delete mode 160000 vendored/baseview delete mode 160000 vendored/nih-plug diff --git a/.cargo/config b/.cargo/config deleted file mode 100644 index 474d2ac..0000000 --- a/.cargo/config +++ /dev/null @@ -1,6 +0,0 @@ -[alias] -xtask = "run --package xtask --release --" - -[profile.dev] -opt-level = 3 -lto = "thin" diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..ebca307 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,11 @@ +[alias] +xtask = "run --package xtask --release --" + +[profile.dev] +opt-level = 1 +lto = false + +[profile.release] +lto = "fat" +panic = "abort" +codegen-units = 1 diff --git a/.gitmodules b/.gitmodules index 05ddc79..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +0,0 @@ -[submodule "vendored/nih-plug"] - path = vendored/nih-plug - url = https://github.com/italicsjenga/nih-plug - branch = raw-window-handle-0.5.0 -[submodule "vendored/baseview"] - path = vendored/baseview - url = https://github.com/italicsjenga/baseview - branch = raw-window-handle-0.5.0 -[submodule "vendored/ash-molten"] - path = vendored/ash-molten - url = https://github.com/italicsjenga/ash-molten diff --git a/Cargo.lock b/Cargo.lock index 0c45c2c..fda7441 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,6 +204,7 @@ dependencies = [ [[package]] name = "ash-molten" version = "0.15.0+1.2.2" +source = "git+https://github.com/italicsjenga/ash-molten#2da15dbee44a35d029d74250828d00de721998f3" dependencies = [ "anyhow", "ash", @@ -285,6 +286,7 @@ checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "baseview" version = "0.1.0" +source = "git+https://github.com/italicsjenga/baseview#1949bda39b673ce8d7c9d6104046388e5af1a944" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.3", @@ -335,7 +337,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -426,9 +428,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -560,7 +562,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -949,7 +951,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -960,7 +962,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1070,25 +1072,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1210,7 +1201,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1730,9 +1721,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -1914,9 +1905,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "45786cec4d5e54a224b15cb9f06751883103a27c19c93eda09b0b4f5f08fefac" [[package]] name = "lock_api" @@ -2189,6 +2180,7 @@ dependencies = [ [[package]] name = "nih_plug" version = "0.0.0" +source = "git+https://github.com/italicsjenga/nih-plug?branch=raw-window-handle-0.5.0#9a582ee03188915adc789673a7858edb590bcab7" dependencies = [ "anyhow", "anymap", @@ -2225,6 +2217,7 @@ dependencies = [ [[package]] name = "nih_plug_derive" version = "0.1.0" +source = "git+https://github.com/italicsjenga/nih-plug?branch=raw-window-handle-0.5.0#9a582ee03188915adc789673a7858edb590bcab7" dependencies = [ "proc-macro2", "quote", @@ -2234,6 +2227,7 @@ dependencies = [ [[package]] name = "nih_plug_xtask" version = "0.1.0" +source = "git+https://github.com/italicsjenga/nih-plug?branch=raw-window-handle-0.5.0#9a582ee03188915adc789673a7858edb590bcab7" dependencies = [ "anyhow", "goblin", @@ -2399,9 +2393,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2445,7 +2439,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2622,7 +2616,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2723,9 +2717,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" dependencies = [ "unicode-ident", ] @@ -3047,7 +3041,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3086,7 +3080,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3135,7 +3129,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3264,9 +3258,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -3309,7 +3303,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3584,7 +3578,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3618,7 +3612,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4110,9 +4104,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 119eaea..c097282 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,12 @@ [workspace] members = ["lib", "gb-emu", "gb-vst", "gb-vst/xtask"] default-members = ["gb-emu"] -exclude = ["./vendored"] resolver = "2" -[profile.release] -lto = "fat" -panic = "abort" -codegen-units = 1 +[workspace.dependencies] +baseview = { git = "https://github.com/italicsjenga/baseview" } +nih_plug = { git = "https://github.com/italicsjenga/nih-plug", branch = "raw-window-handle-0.5.0" } +nih_plug_xtask = { git = "https://github.com/italicsjenga/nih-plug", branch = "raw-window-handle-0.5.0" } [patch.crates-io] librashader = { git = "https://github.com/italicsjenga/librashader" } diff --git a/gb-vst/Cargo.toml b/gb-vst/Cargo.toml index f78a6d6..30f219d 100644 --- a/gb-vst/Cargo.toml +++ b/gb-vst/Cargo.toml @@ -14,8 +14,8 @@ vulkan-static = ["vulkan", "gb-emu-lib/vulkan-static"] [dependencies] gb-emu-lib = { path = "../lib", features = ["config"] } -nih_plug = { path = "../vendored/nih-plug", features = ["standalone"] } -baseview = { path = "../vendored/baseview" } +nih_plug = { workspace = true, features = ["standalone"] } +baseview = { workspace = true } async-ringbuf = "0.1" futures = "0.3" keyboard-types = "0.6.2" diff --git a/gb-vst/xtask/Cargo.toml b/gb-vst/xtask/Cargo.toml index 6165d67..b826c1c 100644 --- a/gb-vst/xtask/Cargo.toml +++ b/gb-vst/xtask/Cargo.toml @@ -6,5 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nih_plug_xtask = { path = "../../vendored/nih-plug/nih_plug_xtask" } - +nih_plug_xtask = { workspace = true } diff --git a/lib/Cargo.toml b/lib/Cargo.toml index b4b77e7..0416cd9 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -41,4 +41,4 @@ ron = { version = "0.8", optional = true } naga = { version = "0.13", optional = true, features = ["wgsl-in", "spv-out"] } [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] -ash-molten = { path = "../vendored/ash-molten", optional = true } +ash-molten = { git = "https://github.com/italicsjenga/ash-molten", optional = true } diff --git a/vendored/ash-molten b/vendored/ash-molten deleted file mode 160000 index 2da15db..0000000 --- a/vendored/ash-molten +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2da15dbee44a35d029d74250828d00de721998f3 diff --git a/vendored/baseview b/vendored/baseview deleted file mode 160000 index 99bded6..0000000 --- a/vendored/baseview +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99bded69793397f32521a894bd83b760dc3b863f diff --git a/vendored/nih-plug b/vendored/nih-plug deleted file mode 160000 index 00ff795..0000000 --- a/vendored/nih-plug +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 00ff79515000b9ef6477aad9a4dafa78b3dc6150