From 42121a9fc94dcd59123cf4ae877167c3c79cd04a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 20 Feb 2024 14:56:55 -0800
Subject: [PATCH] Allow building Rojo with `profile-with-tracy` feature (#862)

---
 Cargo.lock  | 33 ++++++---------------------------
 Cargo.toml  |  7 ++++---
 src/main.rs |  2 +-
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 71031578f..4d8503563 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1406,19 +1406,19 @@ dependencies = [
 
 [[package]]
 name = "profiling"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
+checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42"
 dependencies = [
  "profiling-procmacros",
- "tracy-client 0.16.3",
+ "tracy-client",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f"
+checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8"
 dependencies = [
  "quote 1.0.33",
  "syn 2.0.37",
@@ -1800,7 +1800,6 @@ dependencies = [
  "thiserror",
  "tokio",
  "toml",
- "tracy-client 0.13.2",
  "uuid",
  "walkdir",
  "winreg 0.10.1",
@@ -2321,17 +2320,6 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "tracy-client"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ebfe7a24c18b5ba86d8920c124b41b942352f863fbe0c84d3d63428fa1860f"
-dependencies = [
- "loom",
- "once_cell",
- "tracy-client-sys 0.17.1",
-]
-
 [[package]]
 name = "tracy-client"
 version = "0.16.3"
@@ -2340,16 +2328,7 @@ checksum = "03684af8fb393cc7903210d868e4cb9f5c1e156737be38f52c4217fb21b86bf6"
 dependencies = [
  "loom",
  "once_cell",
- "tracy-client-sys 0.21.2",
-]
-
-[[package]]
-name = "tracy-client-sys"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "178d021455e83078bb38c00b70046b95117ef0a0312cbef925f426d833d11c79"
-dependencies = [
- "cc",
+ "tracy-client-sys",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 96b3ed7c7..de689bf96 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,9 @@ default = []
 # Enable this feature to live-reload assets from the web UI.
 dev_live_assets = []
 
-profile-with-tracy = ["profiling/profile-with-tracy", "tracy-client"]
+# Run Rojo with this feature to open a Tracy session.
+# Currently uses protocol v63, last supported in Tracy 0.9.1.
+profile-with-tracy = ["profiling/profile-with-tracy"]
 
 [workspace]
 members = ["crates/*"]
@@ -87,8 +89,7 @@ thiserror = "1.0.30"
 tokio = { version = "1.12.0", features = ["rt", "rt-multi-thread"] }
 uuid = { version = "1.0.0", features = ["v4", "serde"] }
 clap = { version = "3.1.18", features = ["derive"] }
-profiling = "1.0.6"
-tracy-client = { version = "0.13.2", optional = true }
+profiling = "1.0.14"
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.10.1"
diff --git a/src/main.rs b/src/main.rs
index 5bb9bc6c2..4e0fb507f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,7 +7,7 @@ use librojo::cli::Options;
 
 fn main() {
     #[cfg(feature = "profile-with-tracy")]
-    tracy_client::Client::start();
+    profiling::tracy_client::Client::start();
 
     panic::set_hook(Box::new(|panic_info| {
         // PanicInfo's payload is usually a &'static str or String.