publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Produce .deb for Bionic with the latest libjpeg-turbo

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-08-05 18:05:06 +12:00
parent a9b66833a9
commit 20a8008edf
6 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builder/build-deb-inside-docker
View File

@@ -8,6 +8,7 @@ os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
os_codename=$(lsb_release -cs) os_codename=$(lsb_release -cs)
os_dir="builder/build/${os_codename}" os_dir="builder/build/${os_codename}"
export LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH"
dpkg-buildpackage -us -uc -b dpkg-buildpackage -us -uc -b
mkdir -p "$os_dir" mkdir -p "$os_dir"
cp ../*.deb "$os_dir" cp ../*.deb "$os_dir"

8
builder/dockerfile.ubuntu_bionic.build
View File

@@ -10,8 +10,12 @@ RUN apt-get update && \
apt-get -y install sudo 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 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 cmake git 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 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 # Additions for webp
RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz

2
builder/dockerfile.ubuntu_bionic.deb.build
View File

@@ -5,6 +5,8 @@ RUN apt-get update && \
# Install build-deps for the package. # Install build-deps for the package.
COPY ./debian/control /tmp 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 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
USER 1000 USER 1000

3
builder/dockerfile.ubuntu_bionic.deb.test
View File

@@ -42,6 +42,9 @@ COPY startup/ $STARTUPDIR
### START CUSTOM STUFF #### ### START CUSTOM STUFF ####
ARG KASMVNC_PACKAGE_DIR 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 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
RUN dpkg -i /tmp/*.deb; apt-get -yf install RUN dpkg -i /tmp/*.deb; apt-get -yf install

2
builder/startup/vnc_startup.sh
View File

@@ -2,6 +2,8 @@
### every exit != 0 fails the script ### every exit != 0 fails the script
set -e set -e
export LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH"
# should also source $STARTUPDIR/generate_container_user # should also source $STARTUPDIR/generate_container_user
source $HOME/.bashrc source $HOME/.bashrc

1
debian/shlibs.local vendored Normal file
View File

@@ -0,0 +1 @@
libjpeg 62 libjpeg-turbo (>= 2.1.1)