Immich: build libvips with JPEG 2000 support

Only the libopenjp2-7 runtime was installed, so meson found no OpenJPEG
and libvips came out without jp2kload. Immich lists .jp2 as supported
and the upstream image builds against libopenjp2-7-dev. Install the
headers, and rebuild libvips on update when it lacks jp2kload, the way
ImageMagick is rebuilt when its LibRaw define is missing.

ct/caddy.sh

@@ -38,18 +38,11 @@ update_deb_based() {
     exit
   fi
 
-  cleanup_old_repo_files "caddy"
   msg_info "Updating Caddy LXC"
   apt_update_safe
   $STD apt upgrade -y
   msg_ok "Updated Caddy LXC"
 
-  [[ -f ~/.caddy ]] || dpkg-query -W -f='${Version}' caddy >~/.caddy 2>/dev/null || true
-  if check_for_gh_release "caddy" "caddyserver/caddy"; then
-    DPKG_FORCE_CONFOLD=1 fetch_and_deploy_gh_release "caddy" "caddyserver/caddy" "binary" "latest" "/opt/caddy" "caddy_*_linux_$(arch_resolve).deb"
-    systemctl restart caddy
-  fi
-
   if command -v xcaddy >/dev/null 2>&1; then
     if check_for_gh_release "xcaddy" "caddyserver/xcaddy"; then
       setup_go

ct/immich.sh

@@ -106,7 +106,7 @@ EOF
     libraries=("libjxl" "jpegli" "libheif" "libraw" "imagemagick" "libvips")
     cd "$BASE_DIR"
     msg_warn "Checking for updates to custom image-processing libraries (recompile time: 2-15min per library)"
-    ensure_dependencies liblcms2-dev libjpeg62-turbo-dev libspng-dev libexif-dev
+    ensure_dependencies liblcms2-dev libjpeg62-turbo-dev libspng-dev libexif-dev libopenjp2-7-dev
     $STD git pull
     for library in "${libraries[@]}"; do
       compile_"$library"
@@ -565,7 +565,9 @@ function compile_imagemagick() {
 function compile_libvips() {
   SOURCE=$SOURCE_DIR/libvips
   LIBVIPS_REVISION="$(jq -cr '.revision' "$BASE_DIR"/server/sources/libvips.json)"
-  if [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
+  # Builds made before libopenjp2-7-dev was installed lack JPEG 2000
+  if [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]] ||
+    [[ "$(vips -l foreign 2>/dev/null)" != *jp2kload* ]]; then
     msg_info "Recompiling libvips"
     [[ -d "$SOURCE" ]] && rm -rf "$SOURCE"
     $STD git clone https://github.com/libvips/libvips.git "$SOURCE"

install/caddy-install.sh

@@ -14,8 +14,21 @@ network_check
 update_os
 
 setup_deb_based() {
-  fetch_and_deploy_gh_release "caddy" "caddyserver/caddy" "binary" "latest" "/opt/caddy" "caddy_*_linux_$(arch_resolve).deb"
-  systemctl enable -q --now caddy
+  msg_info "Installing Dependencies"
+  $STD apt install -y \
+    debian-keyring \
+    debian-archive-keyring \
+    apt-transport-https
+  msg_ok "Installed Dependencies"
+
+  msg_info "Installing Caddy"
+  setup_deb822_repo \
+    "caddy" \
+    "https://dl.cloudsmith.io/public/caddy/stable/gpg.key" \
+    "https://dl.cloudsmith.io/public/caddy/stable/deb/debian" \
+    "any-version"
+  $STD apt install -y caddy
+  msg_ok "Installed Caddy"
 
   prompt="${var_caddy_xcaddy:-}"
   [[ -n "$prompt" ]] || read -r -p "${TAB3}Would you like to install xCaddy Addon? <y/N> " prompt

install/immich-install.sh

@@ -84,6 +84,7 @@ $STD apt install --no-install-recommends -y \
   liblqr-1-0 \
   libltdl7 \
   libopenjp2-7 \
+  libopenjp2-7-dev \
   meson \
   ninja-build \
   pkg-config \