LAB-linuxserver/docker-ffmpeg
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ffmpeg.git synced 2026-02-20 04:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from linuxserver/cargo-c-fix

Browse Source 
fix cargo-c dep issue
This commit is contained in:
aptalca 2025-04-05 19:42:35 -04:00 committed by GitHub
commit 158a5b8f57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -10,6 +10,7 @@ ARG FFMPEG_VERSION
ENV \
DEBIAN_FRONTEND="noninteractive" \
MAKEFLAGS="-j4" \
CMAKE_POLICY_VERSION_MINIMUM="3.5" \
PATH="/root/.cargo/bin:${PATH}"
# versions
@ -131,13 +132,13 @@ RUN \
tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \
cd /tmp/rust && \
./install.sh && \
cargo install cargo-c cbindgen && \
cargo install cargo-c cbindgen --locked && \
python3 -m venv /lsiopy && \
pip install -U --no-cache-dir \
pip \
setuptools \
wheel && \
pip install --no-cache-dir cmake mako meson ninja packaging ply pyyaml
pip install --no-cache-dir cmake==3.31.6 mako meson ninja packaging ply pyyaml
# compile 3rd party libs
RUN \

5
Dockerfile.aarch64
View File

@ -10,6 +10,7 @@ ARG FFMPEG_VERSION
ENV \
DEBIAN_FRONTEND="noninteractive" \
MAKEFLAGS="-j4" \
CMAKE_POLICY_VERSION_MINIMUM="3.5" \
PATH="/root/.cargo/bin:${PATH}"
# versions
@ -95,13 +96,13 @@ RUN \
tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \
cd /tmp/rust && \
./install.sh && \
cargo install cargo-c && \
cargo install cargo-c --locked && \
python3 -m venv /lsiopy && \
pip install -U --no-cache-dir \
pip \
setuptools \
wheel && \
pip install --no-cache-dir cmake meson ninja
pip install --no-cache-dir cmake==3.31.6 meson ninja
# compile 3rd party libs
RUN \