From 40401ef38088994037c648878baf1bcad6ea2e35 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Tue, 24 Jan 2023 21:40:09 +1300 Subject: [PATCH] Support newest libjpeg-turbo on OpenSuse --- builder/dockerfile.opensuse_15.build | 5 ++++- builder/scripts/build-libjpeg-turbo | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/builder/dockerfile.opensuse_15.build b/builder/dockerfile.opensuse_15.build index b3d5e56..245c90c 100644 --- a/builder/dockerfile.opensuse_15.build +++ b/builder/dockerfile.opensuse_15.build @@ -21,7 +21,6 @@ RUN zypper install -ny \ libbz2-devel \ libGLw-devel \ libgnutls-devel \ - libjpeg8-devel \ libopenssl-devel \ libpng16-devel \ libtiff-devel \ @@ -48,6 +47,10 @@ RUN cd /tmp/libwebp-1.0.2 && \ ./configure --enable-static --disable-shared && \ make && make install +ENV SCRIPTS_DIR=/tmp/scripts +COPY builder/scripts $SCRIPTS_DIR +RUN $SCRIPTS_DIR/build-libjpeg-turbo + RUN useradd -u 1000 docker && \ groupadd -g 1000 docker && \ usermod -a -G docker docker diff --git a/builder/scripts/build-libjpeg-turbo b/builder/scripts/build-libjpeg-turbo index a60f5d5..c6c2a03 100755 --- a/builder/scripts/build-libjpeg-turbo +++ b/builder/scripts/build-libjpeg-turbo @@ -21,6 +21,10 @@ install_build_dependencies() { dnf install -y cmake gcc return fi + if [ "$DISTRO" = opensuse ]; then + zypper install -y cmake gcc + return + fi apt-get update apt-get install -y cmake gcc @@ -35,6 +39,10 @@ ensure_libjpeg_is_fast() { dnf install -y nasm return fi + if [ "$DISTRO" = opensuse ]; then + zypper install -y nasm + return + fi apt-get update apt-get install -y nasm