From 78e8b2a4cc988b8c3e5169f93d59b6f66a4b1d5c Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 26 Feb 2025 01:17:03 +0100
Subject: [PATCH] DEV: Use more recent version of libheif (#943)

---
 image/base/Dockerfile          |  8 ++++++--
 image/base/install-imagemagick | 15 ++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 3eab95a..51d2b32 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -2,7 +2,11 @@
 # VERSION:  release
 
 ARG DEBIAN_RELEASE=bookworm
+
 FROM discourse/ruby:3.3.6-${DEBIAN_RELEASE}-slim AS builder
+ARG DEBIAN_RELEASE
+ENV DEBIAN_RELEASE=${DEBIAN_RELEASE}
+RUN echo "deb http://deb.debian.org/debian ${DEBIAN_RELEASE}-backports main" > "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-backports.list"
 RUN apt update && \
 DEBIAN_FRONTEND=noninteractive apt-get -y install wget \
     autoconf build-essential \
@@ -62,9 +66,9 @@ RUN --mount=type=tmpfs,target=/var/log \
     libtcmalloc-minimal4 cmake \
     pngcrush pngquant ripgrep poppler-utils \
 # imagemagick runtime dependencies
-    libheif1 libjbig0 libtiff6 libpng16-16 libfontconfig1 \
+    libjbig0 libtiff6 libpng16-16 libfontconfig1 \
     libwebpdemux2 libwebpmux3 libxext6 librsvg2-2 libgomp1 \
-    fonts-urw-base35 \
+    fonts-urw-base35 libheif1/${DEBIAN_RELEASE}-backports \
 # nginx runtime dependencies \
     nginx-common && \
 # install these without recommends to avoid pulling in e.g.
diff --git a/image/base/install-imagemagick b/image/base/install-imagemagick
index 9ab268e..b1402bd 100755
--- a/image/base/install-imagemagick
+++ b/image/base/install-imagemagick
@@ -14,16 +14,17 @@ WDIR=/tmp/imagemagick
 apt -y -q remove imagemagick
 apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
     libde265-0 libde265-dev ${LIBJPEGTURBO} libwebp7 x265 libx265-dev libtool \
-    libpng16-16 libpng-dev libwebp-dev libgomp1 \
+    libpng16-16 libpng-dev libwebp-dev libgomp1 libaom-dev \
     libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \
-    libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev libheif1 libheif-dev
+    libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev
 
-# Ubuntu doesn't like backports
-if cat /etc/issue | grep -qiE 'Debian GNU/Linux 12|Ubuntu 22'; then
-  apt -y install libaom-dev
+if cat /etc/issue | grep -qi Debian; then
+  # Get VERSION_CODENAME
+  . /etc/os-release
+  # Use backports
+  apt -y -q install libheif1/$VERSION_CODENAME-backports libheif-dev/$VERSION_CODENAME-backports
 else
-  # Use backports instead of compiling it
-  apt -y -q install -t bullseye-backports libaom-dev
+  apt -y -q install libheif1 libheif-dev
 fi
 
 mkdir -p $WDIR
-- 
2.25.1