From 6a628ee551f115093c64f79e4e22317f8948e10a Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Tue, 29 Sep 2026 20:11:40 +0200
Subject: [PATCH] Hoist the CultLib and odin-core pins into one workspace table

Sleipnir joins the workspace at Muninn's pins (CultLib c2a9a6e, odin-core
Odin 3e96c6c) instead of Odin main's a8aedda and a path dependency.
Muninn and Sleipnir now move together by construction. Manifests and
lock only; no source change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 Cargo.lock                        | 23 +++++++++++++++++++++++
 Cargo.toml                        |  9 +++++++++
 crates/muninn-daemon/Cargo.toml   |  8 ++++----
 crates/sleipnir-daemon/Cargo.toml |  8 ++++----
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 27c00d7..2419f4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -791,6 +791,20 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
+[[package]]
+name = "sleipnir-daemon"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "cultcache-rs",
+ "cultmesh-rs",
+ "cultnet-rs",
+ "odin-core",
+ "rmp-serde",
+ "serde_json",
+ "vigem-client",
+]
+
 [[package]]
 name = "socket2"
 version = "0.5.10"
@@ -878,6 +892,15 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "vigem-client"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b857e6f99efe1e1eb1e4dfb035de8ae7ec8ec56bd1928edcbd7c6e4427634d52"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
diff --git a/Cargo.toml b/Cargo.toml
index a6c8188..12add68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ members = [
     "crates/muninn-daemon",
     "crates/muninn-move-tracker",
     "crates/muninn-psmoveapi-tracker",
+    "crates/sleipnir-daemon",
 ]
 resolver = "3"
 
@@ -10,3 +11,11 @@ resolver = "3"
 edition = "2024"
 license = "MIT"
 publish = false
+
+# One pin per shared upstream. Muninn and Sleipnir resolve the same CultLib and
+# odin-core by construction; a bump is one edit here.
+[workspace.dependencies]
+cultcache-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "c2a9a6e526390808ef195759056fda0b9a55d8a3", package = "cultcache-rs" }
+cultmesh-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "c2a9a6e526390808ef195759056fda0b9a55d8a3", package = "cultmesh-rs" }
+cultnet-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "c2a9a6e526390808ef195759056fda0b9a55d8a3", package = "cultnet-rs" }
+odin-core = { git = "https://github.com/GameCult/Odin.git", rev = "3e96c6c85ca8b89b1bc7b01c1b7744f43111be99" }
diff --git a/crates/muninn-daemon/Cargo.toml b/crates/muninn-daemon/Cargo.toml
index ac34344..5b495ee 100644
--- a/crates/muninn-daemon/Cargo.toml
+++ b/crates/muninn-daemon/Cargo.toml
@@ -15,13 +15,13 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1"
-cultcache-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "c2a9a6e526390808ef195759056fda0b9a55d8a3", package = "cultcache-rs" }
-cultmesh-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "c2a9a6e526390808ef195759056fda0b9a55d8a3", package = "cultmesh-rs" }
-cultnet-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "c2a9a6e526390808ef195759056fda0b9a55d8a3", package = "cultnet-rs" }
+cultcache-rs = { workspace = true }
+cultmesh-rs = { workspace = true }
+cultnet-rs = { workspace = true }
 libc = "0.2"
 muninn-move-tracker = { path = "../muninn-move-tracker" }
 muninn-psmoveapi-tracker = { path = "../muninn-psmoveapi-tracker", optional = true }
-odin-core = { git = "https://github.com/GameCult/Odin.git", rev = "3e96c6c85ca8b89b1bc7b01c1b7744f43111be99" }
+odin-core = { workspace = true }
 rmp-serde = "1.3"
 serde = { version = "1", features = ["derive"] }
 serde_bytes = "0.11"
diff --git a/crates/sleipnir-daemon/Cargo.toml b/crates/sleipnir-daemon/Cargo.toml
index c0372a4..b10f048 100644
--- a/crates/sleipnir-daemon/Cargo.toml
+++ b/crates/sleipnir-daemon/Cargo.toml
@@ -11,10 +11,10 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1"
-cultmesh-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "a8aeddacab7dd4b9e634b4420867ea3b402cb858", package = "cultmesh-rs" }
-cultnet-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "a8aeddacab7dd4b9e634b4420867ea3b402cb858", package = "cultnet-rs" }
-cultcache-rs = { git = "https://github.com/GameCult/CultLib.git", rev = "a8aeddacab7dd4b9e634b4420867ea3b402cb858", package = "cultcache-rs" }
-odin-core = { path = "../odin-core" }
+cultmesh-rs = { workspace = true }
+cultnet-rs = { workspace = true }
+cultcache-rs = { workspace = true }
+odin-core = { workspace = true }
 rmp-serde = "1.3"
 serde_json = "1"