From 8d3a3c6433533e5e3d4909d5122cc97613c6e95c Mon Sep 17 00:00:00 2001 From: Polochon_street Date: Wed, 3 Jan 2024 21:39:22 +0100 Subject: [PATCH 1/2] Bump rust-ffmpeg to hopefully support rpis. --- CHANGELOG.md | 3 +++ Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- src/library.rs | 7 +++++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7f46d3..4acbc0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ #Changelog +## bliss 0.6.11 +* Bump rust-ffmpeg to 6.1.1 to fix build for raspberry pis. + ## bliss 0.6.10 * Make the `analyze` function public, for people who don't want to use ffmpeg diff --git a/Cargo.lock b/Cargo.lock index eec8c11..52f4773 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,7 @@ checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bliss-audio" -version = "0.6.10" +version = "0.6.11" dependencies = [ "adler32", "anyhow", @@ -410,9 +410,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "ffmpeg-next" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f45d337871329d85f5aad1e3d7b09d033cd611d50f734fd6464c731fe7c769bf" +checksum = "4e72c72e8dcf638fb0fb03f033a954691662b5dabeaa3f85a6607d101569fccd" dependencies = [ "bitflags 1.3.2", "ffmpeg-sys-next", diff --git a/Cargo.toml b/Cargo.toml index 7744023..401e17a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bliss-audio" -version = "0.6.10" +version = "0.6.11" build = "build.rs" authors = ["Polochon-street "] edition = "2021" @@ -40,7 +40,7 @@ serde = ["dep:serde"] # Until https://github.com/aubio/aubio/issues/336 is somehow solved # Hopefully we'll be able to use the official aubio-rs at some point. bliss-audio-aubio-rs = "0.2.1" -ffmpeg-next = "6.1.0" +ffmpeg-next = "6.1.1" ffmpeg-sys-next = { version = "6.1.0", default-features = false } log = "0.4.17" # `rayon` is used only by `par_mapv_inplace` in chroma.rs. diff --git a/src/library.rs b/src/library.rs index 3fa8efa..f271dbb 100644 --- a/src/library.rs +++ b/src/library.rs @@ -1155,6 +1155,13 @@ impl Library { ), None => (None, None), }; + let x = vec![68, 105, 101, 32, 196, 114, 122, 116, 101, 101]; + //println!("{}", String::from_utf8(x).unwrap()); + println!( + "{}", + String::from_utf8(song.artist.clone().unwrap().as_bytes().to_vec()).unwrap() + ); + println!("{:x?}", song.artist.clone().unwrap().as_bytes()); tx.execute( " insert into song ( From 6b747e224cd20e8dc245f4e5ee4730213c1493d3 Mon Sep 17 00:00:00 2001 From: Polochon_street Date: Wed, 3 Jan 2024 21:50:15 +0100 Subject: [PATCH 2/2] Rollback testing changes --- src/library.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/library.rs b/src/library.rs index f271dbb..3fa8efa 100644 --- a/src/library.rs +++ b/src/library.rs @@ -1155,13 +1155,6 @@ impl Library { ), None => (None, None), }; - let x = vec![68, 105, 101, 32, 196, 114, 122, 116, 101, 101]; - //println!("{}", String::from_utf8(x).unwrap()); - println!( - "{}", - String::from_utf8(song.artist.clone().unwrap().as_bytes().to_vec()).unwrap() - ); - println!("{:x?}", song.artist.clone().unwrap().as_bytes()); tx.execute( " insert into song (