From 31e12fb6d2f2835770f3a8c251fbc7d0e363223f Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 5 Jan 2022 12:59:50 -0500
Subject: [PATCH] pin intel driver version

---
 Dockerfile      | 13 +++++++++++--
 README.md       |  1 +
 readme-vars.yml |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 773abd8..ee35e2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,12 @@ 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 && \
@@ -20,6 +26,8 @@ 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 \
@@ -28,8 +36,9 @@ RUN \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
-    i965-va-driver \
-    intel-media-va-driver-non-free \
+    libva2="${INTEL_LIBVA_VER}" \
+    libigdgmm11="${INTEL_GMM_VER}" \
+    intel-media-va-driver-non-free="${INTEL_iHD_VER}" \
     ${JELLYFIN} \
     jellyfin-ffmpeg \
     jellyfin-web \
diff --git a/README.md b/README.md
index 84e6cf6..d867027 100644
--- a/README.md
+++ b/README.md
@@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.01.22:** - Specify Intel iHD driver versions to avoid mismatched libva errors.
 * **25.12.21:** - Fix video device group perms error message.
 * **22.09.21:** - Pull only the server, web and ffmpeg packages instead of the wrapper.
 * **23.06.21:** - Add log message if device permissions are incorrect. Deprecate the `bionic` tag.
diff --git a/readme-vars.yml b/readme-vars.yml
index 9720ba3..1ce7634 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -98,6 +98,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "05.01.22:", desc: "Specify Intel iHD driver versions to avoid mismatched libva errors." }
   - { date: "25.12.21:", desc: "Fix video device group perms error message." }
   - { date: "22.09.21:", desc: "Pull only the server, web and ffmpeg packages instead of the wrapper." }
   - { date: "23.06.21:", desc: "Add log message if device permissions are incorrect. Deprecate the `bionic` tag." }