Merge branch 'feat-record-compose' of github.com:giangndm/8xFF-decent…

…ralized-media-server into feat-record-compose
giangndm · Nov 6, 2024 · 6743562 · 6743562
2 parents b5f1670 + bbbec8c
commit 6743562
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cross.toml b/Cross.toml
@@ -9,11 +9,9 @@ passthrough = [
 
 [target.aarch64-unknown-linux-gnu]
 pre-build = [
-    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get --assume-yes install protobuf-compiler libssl-dev:$CROSS_DEB_ARCH"
+    "apt-get update && apt-get --assume-yes install pkg-config protobuf-compiler libssl-dev"
 ]
 [target.aarch64-unknown-linux-musl]
 pre-build = [
-    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get --assume-yes install protobuf-compiler libssl-dev"
+    "apt-get update && apt-get --assume-yes install pkg-config protobuf-compiler libssl-dev"
 ]
diff --git a/packages/media_record/Cargo.toml b/packages/media_record/Cargo.toml
@@ -28,10 +28,11 @@ serde_json = "1.0.120"
 poem = { version = "3.0", features = ["static-files"], optional = true }
 poem-openapi = { version = "5.0", features = ["swagger-ui"], optional = true }
 chrono = { version = "0.4", optional = true }
+openssl = { version = "0.10", features = ["vendored"], optional = true }
 
 [features]
 default = ["convert_record", "convert_worker"]
-convert_record = ["tokio/full", "tracing-subscriber", "webm", "rtp", "clap", "chrono"]
+convert_record = ["tokio/full", "tracing-subscriber", "webm", "rtp", "clap", "chrono", "openssl"]
 convert_worker = ["tokio/full", "tracing-subscriber", "clap", "convert_record", "poem", "poem-openapi", "media-server-multi-tenancy", "media-server-connector", "media-server-secure", "media-server-codecs"]
 
 [dev-dependencies]