From b291d5c5e1679de465b8018ed29682f8dd2bb06b Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Mon, 20 Jun 2022 20:47:04 +0200
Subject: [PATCH] Docker: Update Debian dependencies

---
 docker/develop/bookworm-slim/Dockerfile | 4 ++--
 docker/develop/bookworm/Dockerfile      | 6 +++---
 docker/develop/bullseye-slim/Dockerfile | 4 ++++
 docker/develop/bullseye/Dockerfile      | 2 ++
 docker/photoprism/armv7/Dockerfile      | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/docker/develop/bookworm-slim/Dockerfile b/docker/develop/bookworm-slim/Dockerfile
index 52dfca13b..63e00db74 100644
--- a/docker/develop/bookworm-slim/Dockerfile
+++ b/docker/develop/bookworm-slim/Dockerfile
@@ -42,9 +42,9 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
       gpg zip unzip wget curl rsync make nano \
       jq lsof lshw sqlite3 mariadb-client \
       exiftool darktable rawtherapee libheif-examples librsvg2-bin \
-      ffmpeg ffmpegthumbnailer libavcodec-extra libwebm1 \
+      ffmpeg ffmpegthumbnailer libavcodec-extra \
       libmatroska7 libdvdread8 libebml5 libgav1-0 libatomic1 \
-      libx264-163 libx265-199 \
+      x264 x265 libvpx7 libwebm1 \
     && \
     echo 'alias ll="ls -alh"' >> /etc/skel/.bashrc && \
     echo 'export PS1="\u@$DOCKER_TAG:\w\$ "' >> /etc/skel/.bashrc && \
diff --git a/docker/develop/bookworm/Dockerfile b/docker/develop/bookworm/Dockerfile
index c77c1103e..a6ab96259 100644
--- a/docker/develop/bookworm/Dockerfile
+++ b/docker/develop/bookworm/Dockerfile
@@ -48,15 +48,15 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
       gpg zip unzip wget curl rsync make nano \
       jq lsof lshw sqlite3 mariadb-client \
       exiftool darktable rawtherapee libheif-examples librsvg2-bin \
-      ffmpeg ffmpegthumbnailer libavcodec-extra libwebm1 \
+      ffmpeg ffmpegthumbnailer libavcodec-extra \
       libmatroska7 libdvdread8 libebml5 libgav1-0 libatomic1 \
-      libx264-163 libx265-199 \
+      x264 x265 libvpx7 libwebm1 \
     && \
     apt-get -qq install \
       apt-utils pkg-config software-properties-common \
       build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \
       chromium chromium-driver chromium-sandbox firefox-esr \
-      libx264-dev libx265-dev libpng-dev libxft-dev \
+      libx264-dev libx265-dev libvpx-dev libwebm-dev libpng-dev libxft-dev \
       libc6-dev libhdf5-serial-dev libzmq3-dev libssl-dev libnss3 \
       libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \
     && \
diff --git a/docker/develop/bullseye-slim/Dockerfile b/docker/develop/bullseye-slim/Dockerfile
index 4b230b8e7..eae8f37fa 100644
--- a/docker/develop/bullseye-slim/Dockerfile
+++ b/docker/develop/bullseye-slim/Dockerfile
@@ -58,6 +58,10 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
       ffmpeg \
       ffmpegthumbnailer \
       libavcodec-extra \
+      x264 \
+      x265 \
+      libvpx6 \
+      libwebm1 \
     && \
     /scripts/install-mariadb.sh mariadb-client && \
     /scripts/install-darktable.sh && \
diff --git a/docker/develop/bullseye/Dockerfile b/docker/develop/bullseye/Dockerfile
index 89b8b9fba..3caff3096 100644
--- a/docker/develop/bullseye/Dockerfile
+++ b/docker/develop/bullseye/Dockerfile
@@ -81,6 +81,8 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
       libzmq3-dev \
       libx264-dev \
       libx265-dev \
+      libvpx-dev \
+      libwebm-dev \
       libnss3 \
       libfreetype6 \
       libfreetype6-dev \
diff --git a/docker/photoprism/armv7/Dockerfile b/docker/photoprism/armv7/Dockerfile
index 76c8b1980..63b3f1bb1 100644
--- a/docker/photoprism/armv7/Dockerfile
+++ b/docker/photoprism/armv7/Dockerfile
@@ -95,9 +95,9 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
       gpg zip unzip wget curl rsync make nano \
       jq lsof lshw sqlite3 mariadb-client \
       exiftool rawtherapee libheif-examples librsvg2-bin \
-      ffmpeg ffmpegthumbnailer libavcodec-extra libwebm1 \
+      ffmpeg ffmpegthumbnailer libavcodec-extra \
       libmatroska7 libdvdread8 libebml5 libgav1-0 libatomic1 \
-      libx264-163 libx265-199 \
+      x264 x265 libvpx7 libwebm1 \
     && \
     echo 'alias ll="ls -alh"' >> /etc/skel/.bashrc && \
     echo 'export PS1="\u@$DOCKER_TAG:\w\$ "' >> /etc/skel/.bashrc && \