From 5ec6a301040f428c9f23ab5026fce082ffcfd676 Mon Sep 17 00:00:00 2001 From: CDrummond Date: Thu, 25 Sep 2025 16:44:23 +0100 Subject: [PATCH] Next try? --- docker/Dockerfile_x86_ffmpeg | 4 +++- docker/Dockerfile_x86_symphonia | 4 +++- docker/docker-build-x86-ffmpeg.sh | 2 +- docker/docker-build-x86-symphonia.sh | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile_x86_ffmpeg b/docker/Dockerfile_x86_ffmpeg index d2f04e8..bcf3a36 100644 --- a/docker/Dockerfile_x86_ffmpeg +++ b/docker/Dockerfile_x86_ffmpeg @@ -3,7 +3,9 @@ FROM debian:bookworm RUN dpkg --add-architecture amd64 RUN apt-get update -RUN apt-get install -y curl git build-essential gcc-multilib musl-tools musl-dev musl yasm +RUN apt-get install -y curl git pkg-config yasm +RUN apt-get install -y build-essential clang +RUN apt-get install -y musl-tools musl-dev musl RUN curl https://sh.rustup.rs -sSf | sh -s -- -y ENV PATH="/root/.cargo/bin/:${PATH}" diff --git a/docker/Dockerfile_x86_symphonia b/docker/Dockerfile_x86_symphonia index 2a35cd2..118fa47 100644 --- a/docker/Dockerfile_x86_symphonia +++ b/docker/Dockerfile_x86_symphonia @@ -3,7 +3,9 @@ FROM debian:bookworm RUN dpkg --add-architecture amd64 RUN apt-get update -RUN apt-get install -y curl git build-essential gcc-multilib musl-tools musl-dev musl yasm pkg-config +RUN apt-get install -y curl git pkg-config yasm +RUN apt-get install -y build-essential clang +RUN apt-get install -y musl-tools musl-dev musl RUN curl https://sh.rustup.rs -sSf | sh -s -- -y ENV PATH="/root/.cargo/bin/:${PATH}" diff --git a/docker/docker-build-x86-ffmpeg.sh b/docker/docker-build-x86-ffmpeg.sh index 55eeca3..6133766 100755 --- a/docker/docker-build-x86-ffmpeg.sh +++ b/docker/docker-build-x86-ffmpeg.sh @@ -9,7 +9,7 @@ function build { echo Building for $1 to $3... if [[ ! -f /build/$1/release/bliss-analyser ]]; then - cargo build --release --features=libav,staticlibav --target $1 + cargo build --release --features=update-aubio-bindings,libav,staticlibav --target $1 fi $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3 diff --git a/docker/docker-build-x86-symphonia.sh b/docker/docker-build-x86-symphonia.sh index 4b1422b..8e96e30 100755 --- a/docker/docker-build-x86-symphonia.sh +++ b/docker/docker-build-x86-symphonia.sh @@ -9,7 +9,7 @@ function build { echo Building for $1 to $3... if [[ ! -f /build/$1/release/bliss-analyser ]]; then - cargo build --release --features=symphonia --target $1 + cargo build --release --features update-aubio-bindings,symphonia --target $1 fi $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3