From 22d323796939c56ffbe01856361db1c90b225a36 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Sun, 5 Jun 2022 16:57:49 +0800
Subject: [PATCH] Switch to jellyfin-ffmpeg5 for nightly

Jellyfin 10.7.x and older are incompatible with FFmpeg 5.x due to a breaking
API change. So we edit the package name of our ffmpeg to jellyfin-ffmpeg5.
---
 Dockerfile         | 13 +------------
 Dockerfile.aarch64 |  2 +-
 Dockerfile.armhf   |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ee35e2b..6d0a8a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,6 @@ LABEL maintainer="thelamer"
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
-# set Intel iHD driver versions
-# https://dgpu-docs.intel.com/releases/index.html
-ARG INTEL_LIBVA_VER="2.13.0+i643~u20.04"
-ARG INTEL_GMM_VER="21.3.3+i643~u20.04"
-ARG INTEL_iHD_VER="21.4.1+i643~u20.04"
-
 RUN \
   echo "**** install packages ****" && \
   apt-get update && \
@@ -26,8 +20,6 @@ RUN \
   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
   echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
   echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu focal unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
-  curl -s https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \
-  echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel-graphics.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin-server"; \
   else \
@@ -36,11 +28,8 @@ RUN \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
-    libva2="${INTEL_LIBVA_VER}" \
-    libigdgmm11="${INTEL_GMM_VER}" \
-    intel-media-va-driver-non-free="${INTEL_iHD_VER}" \
     ${JELLYFIN} \
-    jellyfin-ffmpeg \
+    jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 496a20f..cea09f7 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -31,7 +31,7 @@ RUN \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
-    jellyfin-ffmpeg \
+    jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 6648e78..ad5471a 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -31,7 +31,7 @@ RUN \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
-    jellyfin-ffmpeg \
+    jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
     libfreetype6 \