Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alsa #56

Merged
merged 3 commits into from
Jan 25, 2024
Merged

Alsa #56

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ RUN \
autoconf \
automake \
bzip2 \
cargo \
cmake \
diffutils \
doxygen \
Expand All @@ -67,6 +66,7 @@ RUN \
git \
gperf \
i965-va-driver-shaders \
libasound2-dev \
libexpat1-dev \
libgcc-10-dev \
libgomp1 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -489,7 +496,6 @@ RUN \
RUN \
echo "**** compiling rav1e ****" && \
cd /tmp/rav1e && \
cargo install [email protected]+cargo-0.74.0 --locked && \
cargo cinstall --release && \
strip -d /usr/local/lib/librav1e.so
RUN \
Expand Down Expand Up @@ -520,7 +526,6 @@ RUN \
RUN \
echo "**** compiling libdovi ****" && \
cd /tmp/libdovi/dolby_vision && \
cargo install [email protected]+cargo-0.74.0 --locked && \
cargo cinstall --release && \
strip -d /usr/local/lib/libdovi.so
RUN \
Expand Down Expand Up @@ -725,6 +730,7 @@ RUN \
--disable-debug \
--disable-doc \
--disable-ffplay \
--enable-alsa \
--enable-cuvid \
--enable-ffprobe \
--enable-gpl \
Expand Down Expand Up @@ -844,6 +850,7 @@ RUN \
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
libasound2 \
libedit2 \
libelf1 \
libexpat1 \
Expand Down
12 changes: 10 additions & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ RUN \
autoconf \
automake \
bzip2 \
cargo \
cmake \
diffutils \
g++ \
gcc \
git \
gperf \
libasound2-dev \
libexpat1-dev \
libfontconfig1-dev \
libgcc-10-dev \
Expand All @@ -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 \
Expand Down Expand Up @@ -272,7 +279,6 @@ RUN \
RUN \
echo "**** compiling rav1e ****" && \
cd /tmp/rav1e && \
cargo install [email protected]+cargo-0.74.0 --locked && \
cargo cinstall --release && \
strip -d /usr/local/lib/librav1e.so
RUN \
Expand Down Expand Up @@ -437,6 +443,7 @@ RUN \
--disable-debug \
--disable-doc \
--disable-ffplay \
--enable-alsa \
--enable-ffprobe \
--enable-gpl \
--enable-libaom \
Expand Down Expand Up @@ -501,6 +508,7 @@ RUN \
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
libasound2 \
libexpat1 \
libfontconfig1 \
libglib2.0-0 \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion root/ffmpegwrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down