Support newest libjpeg-turbo on Fedora 37

2023-03-09 23:20:18 +13:00
parent 252fc2f20c
commit ec347f5b46
2 changed files with 6 additions and 4 deletions
--- a/builder/dockerfile.fedora_thirtyseven.build
+++ b/builder/dockerfile.fedora_thirtyseven.build
@@ -27,8 +27,6 @@ RUN \
    glibc-devel \
    libdrm-devel \
    libepoxy-devel \
-    libjpeg-turbo-devel \
-    libjpeg-turbo-static \
    libmd-devel \
    libpciaccess-devel \
    libtool \
@@ -75,6 +73,11 @@ RUN \
    xorg-x11-xtrans-devel \
    xsltproc

+ENV SCRIPTS_DIR=/tmp/scripts
+COPY builder/scripts $SCRIPTS_DIR
+RUN $SCRIPTS_DIR/build-webp
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
+
 RUN useradd -m docker && echo "docker:docker" | chpasswd

 COPY --chown=docker:docker . /src/