diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c31c99..1b16f43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: - name: Build x86 static-libav version run: | - cargo build --release --features=staticlibav + cargo build --release --features=libav,staticlibav strip target/release/bliss-analyser mkdir releases cp target/release/bliss-analyser releases/bliss-analyser @@ -250,10 +250,10 @@ jobs: # # - name: Build # run: | -# cargo build --release --features update-aubio-bindings,staticlibav +# cargo build --release --features update-aubio-bindings,libav,staticlibav # strip target/release/bliss-analyser # cp target/release/bliss-analyser releases/bliss-analyser-x86_64 -# cargo build --target=aarch64-apple-darwin --release --features update-aubio-bindings,staticlibav +# cargo build --target=aarch64-apple-darwin --release --features update-aubio-bindings,libav,staticlibav # strip target/aarch64-apple-darwin/release/bliss-analyser # cp target/aarch64-apple-darwin/release/bliss-analyser releases/bliss-analyser-arm64 # diff --git a/Cargo.toml b/Cargo.toml index 4033460..b10b02d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ hhmmss = "0.1.0" [features] libav = ["bliss-audio/ffmpeg"] update-aubio-bindings = ["bliss-audio/update-aubio-bindings"] -staticlibav = ["bliss-audio/ffmpeg", "bliss-audio/build-ffmpeg", "bliss-audio/ffmpeg-static"] +staticlibav = ["bliss-audio/build-ffmpeg", "bliss-audio/ffmpeg-static"] [dependencies.bliss-audio] default-features = false diff --git a/docker/docker-build-arm-staticlibav.sh b/docker/docker-build-arm-staticlibav.sh index f96c779..91956a2 100755 --- a/docker/docker-build-arm-staticlibav.sh +++ b/docker/docker-build-arm-staticlibav.sh @@ -14,7 +14,7 @@ function build { if [[ ! -f /build/$1/release/bliss-analyser ]]; then export RUST_BACKTRACE=full export PKG_CONFIG=${1//unknown-/}-pkg-config - BINDGEN_EXTRA_CLANG_ARGS="--sysroot /usr/${1//unknown-/}" cargo build --release --features=staticlibav --target $1 + BINDGEN_EXTRA_CLANG_ARGS="--sysroot /usr/${1//unknown-/}" cargo build --release --features=libav,staticlibav --target $1 fi $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3