From 6df118a3e02fe5122b8163ebad77b9f3532d2901 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Mon, 14 Oct 2024 21:11:42 +0200 Subject: refactor(libmpv2): Include in the workspace --- Cargo.lock | 4 ++-- Cargo.toml | 8 +++++++- crates/libmpv2/Cargo.toml | 18 +++++++++++------- crates/libmpv2/libmpv2-sys/Cargo.toml | 13 +++++++++---- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 646be94..3798bbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -905,7 +905,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmpv2" -version = "4.0.0" +version = "1.2.1" dependencies = [ "crossbeam", "libmpv2-sys", @@ -916,7 +916,7 @@ dependencies = [ [[package]] name = "libmpv2-sys" -version = "4.0.0" +version = "1.2.1" dependencies = [ "bindgen", ] diff --git a/Cargo.toml b/Cargo.toml index 4f35424..cfa9a9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,13 @@ [workspace] resolver = "2" -members = ["crates/bytes", "crates/yt_dlp", "yt"] +members = [ + "crates/bytes", + "crates/yt_dlp", + "crates/libmpv2", + "crates/libmpv2/libmpv2-sys", + "yt", +] [workspace.package] edition = "2021" diff --git a/crates/libmpv2/Cargo.toml b/crates/libmpv2/Cargo.toml index 8d45872..fc92fbf 100644 --- a/crates/libmpv2/Cargo.toml +++ b/crates/libmpv2/Cargo.toml @@ -10,18 +10,22 @@ [package] name = "libmpv2" -version = "4.0.0" -edition = "2021" -license = "LGPL-2.1" -readme = "README.md" description = "Libmpv abstraction that's easy to use and can play next to all codecs and containers" keywords = ["media", "playback", "mpv", "libmpv"] - +readme = "README.md" +categories = [] +version.workspace = true +edition.workspace = true +authors.workspace = true +license.workspace = true +repository.workspace = true +rust-version.workspace = true +publish = false [dependencies] -libmpv2-sys = { path = "libmpv2-sys", version = "4.0.0" } +libmpv2-sys = { path = "libmpv2-sys" } thiserror = "1.0.64" -log = { version = "0.4.22" } +log.workspace = true [dev-dependencies] crossbeam = "0.8" diff --git a/crates/libmpv2/libmpv2-sys/Cargo.toml b/crates/libmpv2/libmpv2-sys/Cargo.toml index 71455c1..97916e8 100644 --- a/crates/libmpv2/libmpv2-sys/Cargo.toml +++ b/crates/libmpv2/libmpv2-sys/Cargo.toml @@ -10,12 +10,17 @@ [package] name = "libmpv2-sys" -version = "4.0.0" -edition = "2021" -license = "LGPL-2.1" -build = "build.rs" description = "Libmpv bindings generated by bindgen" +build = "build.rs" keywords = ["media", "playback", "mpv", "libmpv"] +categories = [] +version.workspace = true +edition.workspace = true +authors.workspace = true +license.workspace = true +repository.workspace = true +rust-version.workspace = true +publish = false [build-dependencies] bindgen = { version = "0.70.1" } -- cgit 1.4.1