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

KASM-3806 bump fedora and alpine xorg versions

Browse Source
This commit is contained in:
ryan.kuba 2023-03-04 14:16:05 -08:00
parent 90fd90b948
commit 8b9ef1bc15
No known key found for this signature in database
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/build.sh
View File

@ -47,7 +47,7 @@ cd /tmp
# default to the version of x in Ubuntu 18.04, otherwise caller will need to specify # default to the version of x in Ubuntu 18.04, otherwise caller will need to specify
XORG_VER=${XORG_VER:-"1.19.6"} XORG_VER=${XORG_VER:-"1.19.6"}
XORG_PATCH=$(echo "$XORG_VER" | grep -Po '^\d.\d+' | sed 's#\.##') XORG_PATCH=$(echo "$XORG_VER" | grep -Po '^\d.\d+' | sed 's#\.##')
wget --no-check-certificate https://www.x.org/archive/individual/xserver/xorg-server-${XORG_VER}.tar.bz2 wget --no-check-certificate https://www.x.org/archive/individual/xserver/xorg-server-${XORG_VER}.tar.gz
#git clone https://kasmweb@bitbucket.org/kasmtech/kasmvnc.git #git clone https://kasmweb@bitbucket.org/kasmtech/kasmvnc.git
#cd kasmvnc #cd kasmvnc
@ -64,7 +64,7 @@ cmake -D CMAKE_BUILD_TYPE=RelWithDebInfo . -DBUILD_VIEWER:BOOL=OFF \
-DENABLE_GNUTLS:BOOL=OFF -DENABLE_GNUTLS:BOOL=OFF
make -j5 make -j5
tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.bz2 --strip-components=1 tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.gz --strip-components=1
cd unix/xserver cd unix/xserver
patch -Np1 -i ../xserver${XORG_PATCH}.patch patch -Np1 -i ../xserver${XORG_PATCH}.patch
@ -99,8 +99,8 @@ fi
--disable-config-hal \ --disable-config-hal \
--disable-config-udev \ --disable-config-udev \
--disable-dmx \ --disable-dmx \
--disable-dri \ --enable-dri \
--disable-dri2 \ --enable-dri2 \
--disable-kdrive \ --disable-kdrive \
--disable-static \ --disable-static \
--disable-xephyr \ --disable-xephyr \

2
builder/dockerfile.alpine_317.build
View File

@ -2,7 +2,7 @@ FROM alpine:3.17
ENV KASMVNC_BUILD_OS alpine ENV KASMVNC_BUILD_OS alpine
ENV KASMVNC_BUILD_OS_CODENAME 317 ENV KASMVNC_BUILD_OS_CODENAME 317
ENV XORG_VER 1.20.7 ENV XORG_VER 1.20.14
RUN \ RUN \
echo "**** install build deps ****" && \ echo "**** install build deps ****" && \

21
builder/dockerfile.fedora_thirtyseven.build
View File

@ -2,22 +2,34 @@ FROM fedora:37
ENV KASMVNC_BUILD_OS fedora ENV KASMVNC_BUILD_OS fedora
ENV KASMVNC_BUILD_OS_CODENAME thirtyseven ENV KASMVNC_BUILD_OS_CODENAME thirtyseven
ENV XORG_VER 1.20.7 ENV XORG_VER 1.20.14
RUN \ RUN \
echo "**** install build deps ****" && \ echo "**** install build deps ****" && \
dnf group install -y \
"C Development Tools and Libraries" \
"Development Tools" && \
dnf install -y \ dnf install -y \
autoconf \ autoconf \
automake \ automake \
bison \
byacc \
bzip2 \ bzip2 \
cmake \ cmake \
diffutils \
doxygen \
file \
flex \
fop \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \ git \
glibc-devel \
libdrm-devel \ libdrm-devel \
libepoxy-devel \ libepoxy-devel \
libjpeg-turbo-devel \ libjpeg-turbo-devel \
libjpeg-turbo-static \ libjpeg-turbo-static \
libmd-devel \
libpciaccess-devel \ libpciaccess-devel \
libtool \ libtool \
libwebp-devel \ libwebp-devel \
@ -37,12 +49,15 @@ RUN \
mesa-libgbm-devel \ mesa-libgbm-devel \
mesa-libGL-devel \ mesa-libGL-devel \
meson \ meson \
mingw64-binutils \
mt-st \
nettle-devel \ nettle-devel \
openssl-devel \ openssl-devel \
patch \ patch \
pixman-devel \ pixman-devel \
wayland-devel \ wayland-devel \
wget \ wget \
which \
xcb-util-devel \ xcb-util-devel \
xcb-util-image-devel \ xcb-util-image-devel \
xcb-util-keysyms-devel \ xcb-util-keysyms-devel \
@ -52,11 +67,13 @@ RUN \
xkbcomp \ xkbcomp \
xkbcomp-devel \ xkbcomp-devel \
xkeyboard-config \ xkeyboard-config \
xmlto \
xorg-x11-font-utils \ xorg-x11-font-utils \
xorg-x11-proto-devel \ xorg-x11-proto-devel \
xorg-x11-server-common \ xorg-x11-server-common \
xorg-x11-server-devel \ xorg-x11-server-devel \
xorg-x11-xtrans-devel xorg-x11-xtrans-devel \
xsltproc
RUN useradd -m docker && echo "docker:docker" | chpasswd RUN useradd -m docker && echo "docker:docker" | chpasswd