From 56935c27084b91345d8231d52b6b59b75c25d913 Mon Sep 17 00:00:00 2001 From: Difegue Date: Fri, 19 Aug 2022 18:41:21 +0200 Subject: [PATCH] (#665) Add tentative JPEGXL support --- lib/LANraragi/Utils/Generic.pm | 2 +- tools/Documentation/installing-lanraragi/source.md | 2 +- tools/build/docker/Dockerfile | 2 +- tools/build/docker/install-everything.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/LANraragi/Utils/Generic.pm b/lib/LANraragi/Utils/Generic.pm index d3f9b5279..f15d8cc32 100644 --- a/lib/LANraragi/Utils/Generic.pm +++ b/lib/LANraragi/Utils/Generic.pm @@ -56,7 +56,7 @@ sub trim_url { # Checks if the provided file is an image. # Uses non-capturing groups (?:) to avoid modifying the incoming argument. sub is_image { - return $_[0] =~ /^.+\.(?:png|jpg|gif|bmp|jpeg|jfif|webp|avif|heif|heic)$/i; + return $_[0] =~ /^.+\.(?:png|jpg|gif|bmp|jpeg|jfif|webp|avif|heif|heic|jxl|)$/i; } # Checks if the provided file is an archive. diff --git a/tools/Documentation/installing-lanraragi/source.md b/tools/Documentation/installing-lanraragi/source.md index c89d82d6f..2dd5f594e 100644 --- a/tools/Documentation/installing-lanraragi/source.md +++ b/tools/Documentation/installing-lanraragi/source.md @@ -20,7 +20,7 @@ For information, my personal tests are done using Debian's vendor Perl. apt-get update apt-get upgrade -y apt-get install build-essential make gnupg pkg-config \ -cpanminus redis-server libarchive-dev imagemagick webp libssl-dev zlib1g-dev \ +cpanminus redis-server libarchive-dev imagemagick webp libssl-dev zlib1g-dev libjxl-dev \ perlmagick ghostscript npm ``` diff --git a/tools/build/docker/Dockerfile b/tools/build/docker/Dockerfile index 22b134a96..d7cae96c6 100644 --- a/tools/build/docker/Dockerfile +++ b/tools/build/docker/Dockerfile @@ -1,5 +1,5 @@ # DOCKER-VERSION 0.3.4 -FROM alpine:3.14 +FROM alpine:3.16 LABEL git="https://github.com/Difegue/LANraragi" ENV S6_KEEP_ENV 1 diff --git a/tools/build/docker/install-everything.sh b/tools/build/docker/install-everything.sh index 07b582fa5..c5fb5a14c 100755 --- a/tools/build/docker/install-everything.sh +++ b/tools/build/docker/install-everything.sh @@ -14,7 +14,7 @@ if [ -f /etc/alpine-release ]; then if [ "$alpine_version" = "3.12.12" ]; then apk add nodejs-npm else # Those packages don't exist on 3.12 - apk add nodejs npm s6-overlay s6-overlay-preinit + apk add nodejs npm s6-overlay s6-overlay-preinit libjxl fi fi