From 55c8c1e80e4a21e527f8c2ebde28f80a5b581515 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Wed, 25 Jan 2023 17:27:10 +1300
Subject: [PATCH] Support newest libjpeg-turbo on Fedora 33

---
 builder/dockerfile.fedora_thirtythree.build | 8 ++++++--
 builder/scripts/common.sh                   | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/builder/dockerfile.fedora_thirtythree.build b/builder/dockerfile.fedora_thirtythree.build
index b9f5720..6aaff72 100644
--- a/builder/dockerfile.fedora_thirtythree.build
+++ b/builder/dockerfile.fedora_thirtythree.build
@@ -7,7 +7,7 @@ ENV XORG_VER 1.20.10
 # RUN dnf install -y build-dep xorg-server libxfont-dev sudo
 RUN dnf install -y gcc cmake git gnutls-devel vim wget
 #tightvncserver
-RUN dnf install -y libjpeg-turbo-devel libpng-devel libtiff-devel giflib-devel openssl-devel
+RUN dnf install -y libpng-devel libtiff-devel giflib-devel openssl-devel
 
 #libavcodec-dev
 RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
@@ -16,7 +16,7 @@ RUN dnf -y install ffmpeg-devel
 
 RUN dnf install -y make
 RUN dnf group install -y "Development Tools"
-RUN dnf install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
+RUN dnf install -y xorg-x11-server-devel zlib-devel
 RUN dnf install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
   xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel libXrandr-devel libXtst-devel \
   libXcursor-devel
@@ -30,6 +30,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 -m docker && echo "docker:docker" | chpasswd
 
 COPY --chown=docker:docker . /src/
diff --git a/builder/scripts/common.sh b/builder/scripts/common.sh
index c066d73..4ed44b5 100644
--- a/builder/scripts/common.sh
+++ b/builder/scripts/common.sh
@@ -5,6 +5,8 @@ detect_distro() {
     DISTRO=centos
   elif [ -f /etc/oracle-release ]; then
     DISTRO=oracle
+  elif [ -f /etc/fedora-release ]; then
+    DISTRO=fedora
   elif [ -f /usr/bin/zypper ]; then
     DISTRO=opensuse
   else
@@ -18,6 +20,7 @@ install_packages() {
   case "$DISTRO" in
     centos) install_cmd="yum install -y" ;;
     oracle) install_cmd="dnf install -y" ;;
+    fedora) install_cmd="dnf install -y" ;;
     opensuse) install_cmd="zypper install -y" ;;
     *) install_cmd="apt-get update && apt-get install -y"
   esac