Add alsa support by default + bumps FFmpeg to v5.1.3

Build.alpine.env

@@ -11,5 +11,6 @@ LAME_VERSION=3.100-r0
 OPUS_VERSION=1.3.1-r1
 VORBIS_VERSION=1.3.7-r0
 FBDEV_VERSION=0.5.0-r3
+ALSA_VERSION=1.2.7.2-r0
 V4L_VERSION=1.22.1-r1
-FFMPEG_VERSION=5.1.2
+FFMPEG_VERSION=5.1.3

Build.alpine.rpi.env

@@ -1,4 +1,2 @@
 # FFMPEG RPI PACKAGES
 RPI_VERSION=0.20200813-r1
-ALSA_VERSION=1.2.7.2-r0
-

Build.sh

@@ -25,6 +25,7 @@ function build_default() {
     --build-arg LAME_VERSION=$LAME_VERSION \
     --build-arg OPUS_VERSION=$OPUS_VERSION \
     --build-arg VORBIS_VERSION=$VORBIS_VERSION \
+    --build-arg ALSA_VERSION=$ALSA_VERSION \
     --build-arg FFMPEG_VERSION=$FFMPEG_VERSION \
     --platform linux/amd64 \
     -f Dockerfile.alpine \
@@ -84,8 +85,8 @@ function build_cuda() {
 }
 
 function build_vaapi() {
-  source_env ./Build.alpine.env
-  source_env ./Build.alpine.vaapi.env
+  source_env ./Build.ubuntu.env
+  source_env ./Build.ubuntu.vaapi.env
   docker buildx build \
     --load \
     --build-arg BUILD_IMAGE=$OS_NAME:$OS_VERSION \
@@ -99,17 +100,8 @@ function build_vaapi() {
     --build-arg OPUS_VERSION=$OPUS_VERSION \
     --build-arg VORBIS_VERSION=$VORBIS_VERSION \
     --build-arg FFMPEG_VERSION=$FFMPEG_VERSION \
-    --build-arg LIBAV_VERSION=$LIBAV_VERSION \
-    --build-arg LIBVDPAU_VERSION=$LIBVDPAU_VERSION \
-    --build-arg MESA_VA_GALLIUM_VERSION=$MESA_VA_GALLIUM_VERSION \
-    --build-arg MESA_VDPAU_GALLIUM_VERSION=$MESA_VDPAU_GALLIUM_VERSION \
-    --build-arg LIBVA_VDPAU_DRIVER_VERSION=$LIBVA_VDPAU_DRIVER_VERSION \
-    --build-arg INTEL_GMMLIB_VERSION=$INTEL_GMMLIB_VERSION \
-    --build-arg INTEL_MEDIA_DRIVER_VERSION=$INTEL_MEDIA_DRIVER_VERSION \
-    --build-arg INTEL_MEDIA_SDK_VERSION=$INTEL_MEDIA_SDK_VERSION \
-    --build-arg INTEL_VAAPI_DRIVER=$INTEL_VAAPI_DRIVER \
     --platform linux/amd64 \
-    -f Dockerfile.alpine.vaapi \
+    -f Dockerfile.ubuntu.vaapi \
     -t datarhei/base:$OS_NAME-ffmpeg-vaapi-$OS_VERSION-$FFMPEG_VERSION .
   docker tag datarhei/base:$OS_NAME-ffmpeg-vaapi-$OS_VERSION-$FFMPEG_VERSION datarhei/base:$OS_NAME-ffmpeg-vaapi-latest
 }

Build.ubuntu.env

@@ -11,4 +11,4 @@ LAME_VERSION=3.100
 OPUS_VERSION=1.3.1
 OGG_VERSION=1.3.5
 VORBIS_VERSION=1.3.7
-FFMPEG_VERSION=5.1.2
+FFMPEG_VERSION=5.1.3

Dockerfile.alpine

@@ -12,6 +12,7 @@ ARG LAME_VERSION=3.100-r0
 ARG OPUS_VERSION=1.3.1-r1
 ARG VORBIS_VERSION=1.3.7-r0
 ARG FBDEV_VERSION=0.5.0-r3
+ARG ALSA_VERSION=1.2.5.1-r1
 ARG V4L_VERSION=1.22.1-r1
 ARG FFMPEG_VERSION=4.4.2
 
@@ -55,6 +56,7 @@ RUN apk add -U \
   lame-dev=${LAME_VERSION} \
   opus-dev=${OPUS_VERSION} \
   libvorbis-dev=${VORBIS_VERSION} \
+  alsa-lib-dev=${ALSA_VERSION} \
   v4l-utils-dev=${V4L_VERSION}
 
 # install and patch ffmpeg
@@ -82,6 +84,7 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
   --enable-libv4l2 \
   --enable-v4l2_m2m \
   --enable-libfreetype \
+  --enable-alsa \
   --enable-libsrt \
   --enable-libx264 \
   --enable-libx265 \
@@ -131,6 +134,7 @@ ARG V4L_VERSION=1.22.1-r1
 RUN apk add --no-cache \
   ca-certificates \
   tzdata \
+  alsa-lib \
   xf86-video-fbdev=${FBDEV_VERSION} \
   v4l-utils=${V4L_VERSION} && \
   ffmpeg -buildconf

Dockerfile.alpine.rpi

@@ -3,7 +3,6 @@ ARG BUILD_IMAGE=alpine:3.15
 FROM $BUILD_IMAGE as builder
 
 ARG RPI_VERSION=0.20200813-r0
-ARG ALSA_VERSION=1.2.5.1-r1
 
 ARG FREETYPE_VERSION=2.11.1-r1
 ARG XML2_VERSION=2.9.13-r0
@@ -15,6 +14,7 @@ ARG LAME_VERSION=3.100-r0
 ARG OPUS_VERSION=1.3.1-r1
 ARG VORBIS_VERSION=1.3.7-r0
 ARG FBDEV_VERSION=0.5.0-r3
+ARG ALSA_VERSION=1.2.5.1-r1
 ARG V4L_VERSION=1.22.1-r1
 ARG FFMPEG_VERSION=4.4.2
 

Dockerfile.ubuntu.cuda

@@ -34,7 +34,8 @@ RUN apt-get update -y && \
   build-essential \
   libtool \
   autoconf \
-  libv4l-dev
+  libv4l-dev \
+  libasound2-dev
 
 # install x264
 RUN mkdir -p /dist && cd /dist && \
@@ -201,6 +202,7 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
   --enable-libnpp \
   --enable-libv4l2 \
   --enable-libfreetype \
+  --enable-alsa \
   --enable-libsrt \
   --enable-libx264 \
   --enable-libx265 \
@@ -226,7 +228,8 @@ RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/ffmpeg.conf && \
   apt-get update && \
   apt-get install -y \
   v4l-utils \
-  fbset && \
+  fbset \
+  libasound2-dev && \
   ffmpeg -buildconf
 
 ENV NVIDIA_VISIBLE_DEVICES all

Dockerfile.ubuntu.vaapi

@@ -35,7 +35,9 @@ RUN apt-get update -y && \
   libv4l-dev \
   libva-drm2 \
   libva2 \
-  i965-va-driver
+  libva-dev \
+  i965-va-driver \
+  libasound2-dev
 
 # install x264
 RUN mkdir -p /dist && cd /dist && \
@@ -177,8 +179,6 @@ RUN mkdir -p /dist && cd /dist && \
 
 COPY ./contrib /contrib
 
-RUN apt-get install -y libva-dev
-
 RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
   patch -p1 < /contrib/ffmpeg-jsonstats.patch && \
   patch -p1 < /contrib/ffmpeg-hlsbitrate.patch && \
@@ -195,6 +195,7 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
   --enable-vaapi \
   --enable-libv4l2 \
   --enable-libfreetype \
+  --enable-alsa \
   --enable-libsrt \
   --enable-libx264 \
   --enable-libx265 \
@@ -223,7 +224,8 @@ RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/ffmpeg.conf && \
   fbset \
   libva-drm2 \
   libva2 \
-  i965-va-driver && \
+  i965-va-driver \
+  libasound2-dev && \
   ffmpeg -buildconf
 
 ENV NVIDIA_VISIBLE_DEVICES all