From a0bafe1f67c8d6e13fd7c1adfb7c0776a2e8d562 Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <YuriAstrakhan@gmail.com>
Date: Tue, 20 Feb 2024 03:49:52 -0500
Subject: [PATCH] Workspace with brotli and brotli-ffi crates

* make both packages into a single workspace
* make `brotli-ffi` use latest `brotli` version
* commented out `brotli-ffi` `simd` feature because it is no longer available
---
 Cargo.toml   | 10 +++++++---
 c/Cargo.toml |  8 +++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d8e713f3..17b6ac39 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,7 @@
+[workspace]
+members = [".", "c"]
+default-members = [".", "c"]
+
 [package]
 name = "brotli"
 version = "3.4.0"
@@ -27,9 +31,9 @@ incremental = false
 
 [dependencies]
 "alloc-no-stdlib" = { version = "2.0" }
-"alloc-stdlib" = { version = "~0.2", optional = true }
-"brotli-decompressor" = { version = "~2.5", default-features = false }
-"sha2" = { version = "~0.10", optional = true }
+"alloc-stdlib" = { version = "0.2", optional = true }
+"brotli-decompressor" = { version = "2.5", default-features = false }
+"sha2" = { version = "0.10", optional = true }
 "packed_simd" = { git = "https://github.com/programingjd/packed_simd.git", rev = "53efe013875b7f23ecc1edd840a20c4cbce3f302", default-features = false, features = ["into_bits"], optional = true }
 
 [features]
diff --git a/c/Cargo.toml b/c/Cargo.toml
index 21f3d588..f190b626 100644
--- a/c/Cargo.toml
+++ b/c/Cargo.toml
@@ -16,18 +16,16 @@ autobins = false
 path = "src/lib.rs"
 crate-type = ["cdylib", "staticlib", "rlib"]
 
-[profile.release]
-lto = true
-
 [dependencies]
-"brotli" = { version = "~3.3", default-features = false, features = ["ffi-api"] }
+"brotli" = { version = "3.4", default-features = false, features = ["ffi-api"], path = ".." }
 
 [features]
 default = ["std"]
 benchmark = ["brotli/benchmark"]
 disable-timer = ["brotli/disable-timer"]
 seccomp = ["brotli/seccomp"]
-simd = ["brotli/simd"]
+# Uncomment once brotli package supports simd feature again
+# simd = ["brotli/simd"]
 std = ["brotli/std"]
 validation = ["brotli/validation"]
 vector_scratch_space = ["brotli/vector_scratch_space"]