Vendor aubio + build ffmpeg all the time

This commit is contained in:
Polochon-street 2021-05-15 18:32:13 +02:00
parent 39d711efd4
commit 523271ee69
5 changed files with 14 additions and 11 deletions

View file

@ -16,6 +16,8 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-04-01

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "aubio-rs"]
path = aubio-rs
url = https://github.com/Polochon-street/aubio-rs

5
Cargo.lock generated
View file

@ -55,7 +55,6 @@ dependencies = [
[[package]]
name = "aubio-rs"
version = "0.2.0"
source = "git+https://github.com/Polochon-street/aubio-rs?branch=aubio-tweaks#6ddd5495d2cbab5fc085fbd7aab4ad5f66580c08"
dependencies = [
"aubio-sys",
]
@ -63,7 +62,6 @@ dependencies = [
[[package]]
name = "aubio-sys"
version = "0.2.0"
source = "git+https://github.com/Polochon-street/aubio-rs?branch=aubio-tweaks#6ddd5495d2cbab5fc085fbd7aab4ad5f66580c08"
dependencies = [
"cc",
]
@ -387,7 +385,8 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]]
name = "ffmpeg-next"
version = "4.3.8"
source = "git+https://github.com/Polochon-street/rust-ffmpeg?branch=fix-cargo-version#0e56d833b7d1b7294c5d5029638659ece24e5291"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3186d58788057973c658e1fa13a26ea1340718a8a131d5e1996d06e2b08befc"
dependencies = [
"bitflags",
"ffmpeg-sys-next",

View file

@ -10,7 +10,10 @@ repository = "https://github.com/Polochon-street/bliss-rs"
readme = "README.md"
[features]
default = ["aubio-rs/static"]
# Building ffmpeg until either
# https://github.com/zmwangx/rust-ffmpeg/pull/60
# or https://github.com/zmwangx/rust-ffmpeg/pull/62 is in
default = ["aubio-rs/static", "build-ffmpeg"]
build-ffmpeg = ["ffmpeg-next/build"]
bench = []
@ -25,13 +28,12 @@ lazy_static = "1.4.0"
rayon = "1.5.0"
crossbeam = "0.8.0"
noisy_float = "0.2.0"
# Until either https://github.com/zmwangx/rust-ffmpeg/pull/60
# or https://github.com/zmwangx/rust-ffmpeg/pull/62 is in
ffmpeg-next = "4.3.8"
log = "0.4.14"
env_logger = "0.8.3"
thiserror = "1.0.24"
aubio-rs = "0.2.0"
# Until https://github.com/aubio/aubio/issues/336 is somehow solved
aubio-rs = {version = "0.2.0", path = "./aubio-rs/aubio-rs"}
[dev-dependencies]
mpd = "0.0.12"
@ -40,7 +42,3 @@ dirs = "3.0.1"
tempdir = "0.3.7"
clap = "2.33.3"
anyhow = "1.0.40"
[patch.crates-io]
aubio-rs = { git = "https://github.com/Polochon-street/aubio-rs", branch = "aubio-tweaks" }
ffmpeg-next = { git = "https://github.com/Polochon-street/rust-ffmpeg", branch = "fix-cargo-version"}

1
aubio-rs Submodule

@ -0,0 +1 @@
Subproject commit 658ee6878737edd1a58ca6164a95bb4a068af2ab