From 1c8fbbcb332db7ead4a2fe4e0120a00e9c5f3d9d Mon Sep 17 00:00:00 2001
From: Julien Rottenberg <julien@rottenberg.info>
Date: Sat, 2 Mar 2024 18:30:32 -0800
Subject: [PATCH] First step, libzimg is not supported on 2.8

---
 .pre-commit-config.yaml                 | 4 ++--
 docker-images/2.8/nvidia2204/Dockerfile | 1 -
 docker-images/2.8/ubuntu2204/Dockerfile | 1 -
 docker-images/2.8/vaapi2204/Dockerfile  | 1 -
 update.py                               | 3 ++-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index af34b77e..f554742e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos: # pre-commit autoupdate
 
   # If you want to avoid flake8 errors due to unused vars or imports:
   - repo: https://github.com/myint/autoflake.git
-    rev: v2.2.1
+    rev: v2.3.0
     hooks:
       - id: autoflake
         args:
@@ -34,7 +34,7 @@ repos: # pre-commit autoupdate
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.2.0
     hooks:
       - id: black
         language_version: python3
diff --git a/docker-images/2.8/nvidia2204/Dockerfile b/docker-images/2.8/nvidia2204/Dockerfile
index 07b542f0..dc9f109b 100644
--- a/docker-images/2.8/nvidia2204/Dockerfile
+++ b/docker-images/2.8/nvidia2204/Dockerfile
@@ -558,7 +558,6 @@ RUN  \
         --enable-libx264 \
         --enable-libx265 \
         --enable-libxvid \
-        --enable-libzimg \
         --enable-libzmq \
         --enable-nonfree \
         --enable-nvenc \
diff --git a/docker-images/2.8/ubuntu2204/Dockerfile b/docker-images/2.8/ubuntu2204/Dockerfile
index 222230e9..5bb80c59 100644
--- a/docker-images/2.8/ubuntu2204/Dockerfile
+++ b/docker-images/2.8/ubuntu2204/Dockerfile
@@ -535,7 +535,6 @@ RUN  \
         --enable-libx264 \
         --enable-libx265 \
         --enable-libxvid \
-        --enable-libzimg \
         --enable-libzmq \
         --enable-nonfree \
         --enable-openssl \
diff --git a/docker-images/2.8/vaapi2204/Dockerfile b/docker-images/2.8/vaapi2204/Dockerfile
index 93c6f641..88ebb6dd 100644
--- a/docker-images/2.8/vaapi2204/Dockerfile
+++ b/docker-images/2.8/vaapi2204/Dockerfile
@@ -535,7 +535,6 @@ RUN  \
         --enable-libx264 \
         --enable-libx265 \
         --enable-libxvid \
-        --enable-libzimg \
         --enable-libzmq \
         --enable-nonfree \
         --enable-openssl \
diff --git a/update.py b/update.py
index 8f40c1ae..794a06dd 100755
--- a/update.py
+++ b/update.py
@@ -148,7 +148,6 @@ def get_major_version(version):
             "--enable-libx264",
             "--enable-libx265",
             "--enable-libxvid",
-            "--enable-libzimg",
             "--enable-libzmq",
             "--enable-nonfree",
             "--enable-openssl",
@@ -170,6 +169,8 @@ def get_major_version(version):
         if version[0:3] != "2.8":
             FFMPEG_CONFIG_FLAGS.append("--enable-libopenjpeg")
             FFMPEG_CONFIG_FLAGS.append("--enable-libkvazaar")
+            FFMPEG_CONFIG_FLAGS.append("--enable-libzimg")
+
         if version == "snapshot" or int(version[0]) > 3:
             FFMPEG_CONFIG_FLAGS.append("--enable-libaom")
             FFMPEG_CONFIG_FLAGS.append("--extra-libs=-lpthread")