diff --git a/Dockerfile b/Dockerfile index f6a671d..ed97933 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,6 @@ RUN \ autoconf \ automake \ bzip2 \ - cargo \ cmake \ diffutils \ doxygen \ @@ -67,6 +66,7 @@ RUN \ git \ gperf \ i965-va-driver-shaders \ + libasound2-dev \ libexpat1-dev \ libgcc-10-dev \ libgomp1 \ @@ -98,6 +98,13 @@ RUN \ yasm \ zlib1g-dev && \ apt-get build-dep mesa -y && \ + mkdir -p /tmp/rust && \ + RUST_VERSION=$(curl -fsX GET https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r '.tag_name') && \ + curl -fo /tmp/rust.tar.gz -L "https://static.rust-lang.org/dist/rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz" && \ + tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \ + cd /tmp/rust && \ + ./install.sh && \ + cargo install cargo-c && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ @@ -489,7 +496,6 @@ RUN \ RUN \ echo "**** compiling rav1e ****" && \ cd /tmp/rav1e && \ - cargo install cargo-c@0.9.27+cargo-0.74.0 --locked && \ cargo cinstall --release && \ strip -d /usr/local/lib/librav1e.so RUN \ @@ -520,7 +526,6 @@ RUN \ RUN \ echo "**** compiling libdovi ****" && \ cd /tmp/libdovi/dolby_vision && \ - cargo install cargo-c@0.9.27+cargo-0.74.0 --locked && \ cargo cinstall --release && \ strip -d /usr/local/lib/libdovi.so RUN \ @@ -725,6 +730,7 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ + --enable-alsa \ --enable-cuvid \ --enable-ffprobe \ --enable-gpl \ @@ -844,6 +850,7 @@ RUN \ echo "**** install runtime ****" && \ apt-get update && \ apt-get install -y \ + libasound2 \ libedit2 \ libelf1 \ libexpat1 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 24e263e..46a0841 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -47,13 +47,13 @@ RUN \ autoconf \ automake \ bzip2 \ - cargo \ cmake \ diffutils \ g++ \ gcc \ git \ gperf \ + libasound2-dev \ libexpat1-dev \ libfontconfig1-dev \ libgcc-10-dev \ @@ -76,6 +76,13 @@ RUN \ xxd \ yasm \ zlib1g-dev && \ + mkdir -p /tmp/rust && \ + RUST_VERSION=$(curl -fsX GET https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r '.tag_name') && \ + curl -fo /tmp/rust.tar.gz -L "https://static.rust-lang.org/dist/rust-${RUST_VERSION}-aarch64-unknown-linux-gnu.tar.gz" && \ + tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \ + cd /tmp/rust && \ + ./install.sh && \ + cargo install cargo-c && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ @@ -272,7 +279,6 @@ RUN \ RUN \ echo "**** compiling rav1e ****" && \ cd /tmp/rav1e && \ - cargo install cargo-c@0.9.27+cargo-0.74.0 --locked && \ cargo cinstall --release && \ strip -d /usr/local/lib/librav1e.so RUN \ @@ -437,6 +443,7 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ + --enable-alsa \ --enable-ffprobe \ --enable-gpl \ --enable-libaom \ @@ -501,6 +508,7 @@ RUN \ echo "**** install runtime ****" && \ apt-get update && \ apt-get install -y \ + libasound2 \ libexpat1 \ libfontconfig1 \ libglib2.0-0 \ diff --git a/README.md b/README.md index 13e49fb..5336135 100644 --- a/README.md +++ b/README.md @@ -173,6 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.01.24:** - Add alsa support. * **18.01.24:** - Let the wrapper pass the ffmpeg exit code to docker run. Bump various libs. * **01.01.24:** - Add rav1e support. Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. * **06.12.23:** - Add libplacebo and libdobi to x86_64. diff --git a/readme-vars.yml b/readme-vars.yml index bfc2570..6b32079 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -177,6 +177,7 @@ full_custom_readme: | ## Versions + * **21.01.24:** - Add alsa support. * **18.01.24:** - Let the wrapper pass the ffmpeg exit code to docker run. Bump various libs. * **01.01.24:** - Add rav1e support. Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. * **06.12.23:** - Add libplacebo and libdobi to x86_64. diff --git a/root/ffmpegwrapper.sh b/root/ffmpegwrapper.sh index 3ab30cc..3123aad 100755 --- a/root/ffmpegwrapper.sh +++ b/root/ffmpegwrapper.sh @@ -35,7 +35,7 @@ do done ## hardware support ## -FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) +FILES=$(find /dev/dri /dev/dvb /dev/snd -type c -print 2>/dev/null) for i in $FILES do