diff --git a/Dockerfile b/Dockerfile index 3866c9b..7e77bb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -935,7 +935,10 @@ RUN \ echo "**** clean up ****" && \ rm -rf \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* && \ + echo "**** quick test ffmpeg ****" && \ + ldd /usr/local/bin/ffmpeg && \ + /usr/local/bin/ffmpeg -version COPY /root / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2ca8a67..46c2e73 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -77,7 +77,6 @@ RUN \ pkg-config \ python3-venv \ x11proto-xext-dev \ - xserver-xorg-dev \ xxd \ yasm \ zlib1g-dev && \ @@ -499,6 +498,7 @@ RUN \ --disable-debug \ --disable-doc \ --disable-ffplay \ + --disable-libdrm \ --enable-alsa \ --enable-ffprobe \ --enable-gpl \ @@ -584,12 +584,16 @@ RUN \ libv4l-0 \ libx11-6 \ libxcb1 \ + libxcb-shm0 \ libxext6 \ libxml2 && \ echo "**** clean up ****" && \ rm -rf \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* && \ + echo "**** quick test ffmpeg ****" && \ + ldd /usr/local/bin/ffmpeg && \ + /usr/local/bin/ffmpeg -version COPY /root / diff --git a/readme-vars.yml b/readme-vars.yml index 7be0663..1540e22 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -177,6 +177,7 @@ full_custom_readme: | ## Versions + * **11.04.24:** - Explicitly disable libdrm on aarch64, add new lib `libxcb-shm0`. Add quick test at the end of build. * **10.04.24:** - Compile ffmpeg with `libfribidi`, `libharfbuzz` and `libfontconfig`, compile libharfbuzz. * **05.04.24:** - Bump ffmpeg to 7.0, bump libdovi, libva, mesa and vulkan-sdk. * **16.03.24:** - Bump libaom, mesa, openjpeg, opus, shaderc and svtav1.