extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-06-27 21:21:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support newest libjpeg-turbo on Fedora 33

Browse Source
This commit is contained in:
Dmitry Maksyoma 2023-01-25 17:27:10 +13:00
parent a5193e240a
commit 55c8c1e80e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/dockerfile.fedora_thirtythree.build
View File

@ -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 build-dep xorg-server libxfont-dev sudo
RUN dnf install -y gcc cmake git gnutls-devel vim wget RUN dnf install -y gcc cmake git gnutls-devel vim wget
#tightvncserver #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 #libavcodec-dev
RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm 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 install -y make
RUN dnf group install -y "Development Tools" 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 \ 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 \ xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel libXrandr-devel libXtst-devel \
libXcursor-devel libXcursor-devel
@ -30,6 +30,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 -m docker && echo "docker:docker" | chpasswd RUN useradd -m docker && echo "docker:docker" | chpasswd
COPY --chown=docker:docker . /src/ COPY --chown=docker:docker . /src/

3
builder/scripts/common.sh
View File

@ -5,6 +5,8 @@ detect_distro() {
DISTRO=centos DISTRO=centos
elif [ -f /etc/oracle-release ]; then elif [ -f /etc/oracle-release ]; then
DISTRO=oracle DISTRO=oracle
elif [ -f /etc/fedora-release ]; then
DISTRO=fedora
elif [ -f /usr/bin/zypper ]; then elif [ -f /usr/bin/zypper ]; then
DISTRO=opensuse DISTRO=opensuse
else else
@ -18,6 +20,7 @@ install_packages() {
case "$DISTRO" in case "$DISTRO" in
centos) install_cmd="yum install -y" ;; centos) install_cmd="yum install -y" ;;
oracle) install_cmd="dnf install -y" ;; oracle) install_cmd="dnf install -y" ;;
fedora) install_cmd="dnf install -y" ;;
opensuse) install_cmd="zypper install -y" ;; opensuse) install_cmd="zypper install -y" ;;
*) install_cmd="apt-get update && apt-get install -y" *) install_cmd="apt-get update && apt-get install -y"
esac esac