Support newest libjpeg-turbo on OpenSuse
This commit is contained in:
@@ -21,7 +21,6 @@ RUN zypper install -ny \
|
|||||||
libbz2-devel \
|
libbz2-devel \
|
||||||
libGLw-devel \
|
libGLw-devel \
|
||||||
libgnutls-devel \
|
libgnutls-devel \
|
||||||
libjpeg8-devel \
|
|
||||||
libopenssl-devel \
|
libopenssl-devel \
|
||||||
libpng16-devel \
|
libpng16-devel \
|
||||||
libtiff-devel \
|
libtiff-devel \
|
||||||
@@ -48,6 +47,10 @@ RUN cd /tmp/libwebp-1.0.2 && \
|
|||||||
./configure --enable-static --disable-shared && \
|
./configure --enable-static --disable-shared && \
|
||||||
make && make install
|
make && make install
|
||||||
|
|
||||||
|
ENV SCRIPTS_DIR=/tmp/scripts
|
||||||
|
COPY builder/scripts $SCRIPTS_DIR
|
||||||
|
RUN $SCRIPTS_DIR/build-libjpeg-turbo
|
||||||
|
|
||||||
RUN useradd -u 1000 docker && \
|
RUN useradd -u 1000 docker && \
|
||||||
groupadd -g 1000 docker && \
|
groupadd -g 1000 docker && \
|
||||||
usermod -a -G docker docker
|
usermod -a -G docker docker
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ install_build_dependencies() {
|
|||||||
dnf install -y cmake gcc
|
dnf install -y cmake gcc
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
if [ "$DISTRO" = opensuse ]; then
|
||||||
|
zypper install -y cmake gcc
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y cmake gcc
|
apt-get install -y cmake gcc
|
||||||
@@ -35,6 +39,10 @@ ensure_libjpeg_is_fast() {
|
|||||||
dnf install -y nasm
|
dnf install -y nasm
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
if [ "$DISTRO" = opensuse ]; then
|
||||||
|
zypper install -y nasm
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y nasm
|
apt-get install -y nasm
|
||||||
|
|||||||
Reference in New Issue
Block a user