From 20a8008edfa9d31862c02a99478a2f723e03c341 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Thu, 5 Aug 2021 18:05:06 +1200
Subject: [PATCH] Produce .deb for Bionic with the latest libjpeg-turbo

---
 builder/build-deb-inside-docker            | 1 +
 builder/dockerfile.ubuntu_bionic.build     | 8 ++++++--
 builder/dockerfile.ubuntu_bionic.deb.build | 2 ++
 builder/dockerfile.ubuntu_bionic.deb.test  | 3 +++
 builder/startup/vnc_startup.sh             | 2 ++
 debian/shlibs.local                        | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 debian/shlibs.local

diff --git a/builder/build-deb-inside-docker b/builder/build-deb-inside-docker
index faca5d0..0707dc5 100755
--- a/builder/build-deb-inside-docker
+++ b/builder/build-deb-inside-docker
@@ -8,6 +8,7 @@ os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
 os_codename=$(lsb_release -cs)
 os_dir="builder/build/${os_codename}"
 
+export LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH"
 dpkg-buildpackage -us -uc -b
 mkdir -p "$os_dir"
 cp ../*.deb "$os_dir"
diff --git a/builder/dockerfile.ubuntu_bionic.build b/builder/dockerfile.ubuntu_bionic.build
index cee01e1..8d530bd 100644
--- a/builder/dockerfile.ubuntu_bionic.build
+++ b/builder/dockerfile.ubuntu_bionic.build
@@ -10,8 +10,12 @@ RUN apt-get update && \
       apt-get -y install sudo
 
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+
+RUN apt-get update && apt-get install -y cmake nasm gcc
+RUN git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git
+RUN export MAKEFLAGS=-j`nproc`; cd libjpeg-turbo && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -G"Unix Makefiles" && make && make install
 
 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
diff --git a/builder/dockerfile.ubuntu_bionic.deb.build b/builder/dockerfile.ubuntu_bionic.deb.build
index ac48856..945b069 100644
--- a/builder/dockerfile.ubuntu_bionic.deb.build
+++ b/builder/dockerfile.ubuntu_bionic.deb.build
@@ -5,6 +5,8 @@ RUN apt-get update && \
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp
+COPY ./libjpeg-turbo_2.1.1_amd64.deb /tmp
+RUN apt-get install /tmp/libjpeg-turbo*deb
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
 USER 1000
diff --git a/builder/dockerfile.ubuntu_bionic.deb.test b/builder/dockerfile.ubuntu_bionic.deb.test
index 793c2ca..c64f0bd 100644
--- a/builder/dockerfile.ubuntu_bionic.deb.test
+++ b/builder/dockerfile.ubuntu_bionic.deb.test
@@ -42,6 +42,9 @@ COPY startup/ $STARTUPDIR
 ### START CUSTOM STUFF ####
 
 ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo_2.1.1_amd64.deb /tmp
+RUN apt-get install /tmp/libjpeg-turbo*deb
+
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
 RUN dpkg -i /tmp/*.deb; apt-get -yf install
 
diff --git a/builder/startup/vnc_startup.sh b/builder/startup/vnc_startup.sh
index c0c3b3c..edaf969 100755
--- a/builder/startup/vnc_startup.sh
+++ b/builder/startup/vnc_startup.sh
@@ -2,6 +2,8 @@
 ### every exit != 0 fails the script
 set -e
 
+export LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH"
+
 # should also source $STARTUPDIR/generate_container_user
 source $HOME/.bashrc
 
diff --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 0000000..a5abe9e
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1 @@
+libjpeg 62 libjpeg-turbo (>= 2.1.1)