Need to use libav with staticlibav

This commit is contained in:
CDrummond 2025-03-04 17:40:02 +00:00
parent 6dcd61d9bb
commit cca929a13e
3 changed files with 5 additions and 5 deletions

View File

@ -46,7 +46,7 @@ jobs:
- name: Build x86 static-libav version - name: Build x86 static-libav version
run: | run: |
cargo build --release --features=staticlibav cargo build --release --features=libav,staticlibav
strip target/release/bliss-analyser strip target/release/bliss-analyser
mkdir releases mkdir releases
cp target/release/bliss-analyser releases/bliss-analyser cp target/release/bliss-analyser releases/bliss-analyser
@ -250,10 +250,10 @@ jobs:
# #
# - name: Build # - name: Build
# run: | # run: |
# cargo build --release --features update-aubio-bindings,staticlibav # cargo build --release --features update-aubio-bindings,libav,staticlibav
# strip target/release/bliss-analyser # strip target/release/bliss-analyser
# cp target/release/bliss-analyser releases/bliss-analyser-x86_64 # 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 # strip target/aarch64-apple-darwin/release/bliss-analyser
# cp target/aarch64-apple-darwin/release/bliss-analyser releases/bliss-analyser-arm64 # cp target/aarch64-apple-darwin/release/bliss-analyser releases/bliss-analyser-arm64
# #

View File

@ -32,7 +32,7 @@ hhmmss = "0.1.0"
[features] [features]
libav = ["bliss-audio/ffmpeg"] libav = ["bliss-audio/ffmpeg"]
update-aubio-bindings = ["bliss-audio/update-aubio-bindings"] 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] [dependencies.bliss-audio]
default-features = false default-features = false

View File

@ -14,7 +14,7 @@ function build {
if [[ ! -f /build/$1/release/bliss-analyser ]]; then if [[ ! -f /build/$1/release/bliss-analyser ]]; then
export RUST_BACKTRACE=full export RUST_BACKTRACE=full
export PKG_CONFIG=${1//unknown-/}-pkg-config 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 fi
$2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3 $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3