From 8fca5b59615b2190c1b89d95fe7fc3fd22469e0c Mon Sep 17 00:00:00 2001
From: James Ketrenos <jketreno@media.ketrenos.com>
Date: Fri, 8 Apr 2022 21:42:43 +0000
Subject: [PATCH] Update to ffmpeg v5.0.1

Enable all ubuntu build flags

Install ffmpeg into run-time image

Signed-off-by: James Ketrenos <jketreno@media.ketrenos.com>
---
 Dockerfile.solution | 37 +++++++++++++++++++++++++++----------
 SOLUTION            |  3 ++-
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.solution b/Dockerfile.solution
index 547a0b1..bc4d782 100644
--- a/Dockerfile.solution
+++ b/Dockerfile.solution
@@ -23,10 +23,16 @@ RUN apt-get update \
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
   && apt-get -q -y install \
-    libva-dev$LIBVA_DEV_VERSION \
-    libmfx-dev$LIBMFX_DEV_VERSION \
-    libmfx1$LIBMFX1_VERSION \
-    vainfo$VAINFO_VERSION
+    libva-dev \
+    libmfx-dev \
+    libmfx1 \
+    vainfo
+
+RUN sed -i -e 's,^# deb-src,deb-src,g' /etc/apt/sources.list
+RUN apt-get update \
+  && DEBIAN_FRONTEND=noninteractive \
+  && apt-get build-dep -y \
+    ffmpeg
 
 ENV LIBVA_DRIVER_NAME=iHD
 
@@ -39,7 +45,17 @@ RUN git clone --depth 1 --branch $FFMPEG_TAG_VERSION https://github.com/ffmpeg/f
 # Build FFmpeg
 WORKDIR /home/user/ffmpeg
 
-RUN ./configure --arch=x86_64 --disable-x86asm --enable-vaapi --enable-libmfx \
+RUN ./configure --arch=x86_64 \
+  --disable-x86asm --enable-vaapi --enable-libmfx \
+--arch=amd64 --enable-gpl --disable-stripping --enable-avresample --disable-filter=resample --enable-avisynth --enable-gnutls \
+--enable-ladspa --enable-libaom --enable-libass --enable-libbluray --enable-libbs2b --enable-libcaca --enable-libcdio --enable-libcodec2 \
+--enable-libflite --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libjack \
+--enable-libmp3lame --enable-libmysofa --enable-libopenjpeg --enable-libopenmpt --enable-libopus --enable-libpulse --enable-librsvg \
+--enable-librubberband --enable-libshine --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libssh --enable-libtheora \
+--enable-libtwolame --enable-libvidstab --enable-libvorbis --enable-libvpx --enable-libwavpack --enable-libwebp --enable-libx265 \
+--enable-libxml2 --enable-libxvid --enable-libzmq --enable-libzvbi --enable-lv2 --enable-omx --enable-openal --enable-opencl --enable-opengl \
+--enable-sdl2 --enable-libdc1394 --enable-libdrm --enable-libiec61883 --enable-nvenc --enable-chromaprint --enable-frei0r --enable-libx264 \
+--enable-shared \
   && make -j $(nproc --all) \
   && sudo make install
 
@@ -57,13 +73,14 @@ USER root
 RUN apt-get -q update \
   && DEBIAN_FRONTEND=noninteractive \
   && apt-get --no-install-recommends -q -y install \
-    intel-media-va-driver-non-free$INTEL_MEDIA_VA_DRIVER_NON_FREE_VERSION \
-    libva2$LIBVA2_VERSION \
-    libmfx1$LIBMFX1_VERSION \
-    vainfo$VAINFO_VERSION \
+    intel-media-va-driver-non-free \
+    libva2 \
+    libmfx1 \
+    vainfo \
     libpciaccess0 \
     pciutils \
-    curl
+    curl \
+    ffmpeg
 
 # Copy ffmpeg and ffprobe from build container
 COPY --from=solution-build /usr/local/bin/ /usr/local/bin/
diff --git a/SOLUTION b/SOLUTION
index b53481e..4480a3a 100644
--- a/SOLUTION
+++ b/SOLUTION
@@ -2,7 +2,8 @@
 # internal repository hosted on osgc.jf.intel.com/internal
 PACKAGE_REPOSITORY=${PACKAGE_REPOSITORY:-https://osgc.jf.intel.com/internal}
 
-FFMPEG_TAG_VERSION=n4.2.1
+#FFMPEG_TAG_VERSION=n4.2.1
+FFMPEG_TAG_VERSION=n5.0.1
 REGISTRY_URL=${REGISTRY_URL:-amr-registry.caas.intel.com/vtt-osgc/solutions}
 RELEASE_INFO=${RELEASE_INFO:-N/A}
 CONTAINER="intel-media-ffmpeg"