From 8b9ef1bc15a22ca85b3d30b2575dbc4b537bef9d Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Sat, 4 Mar 2023 14:16:05 -0800
Subject: [PATCH] KASM-3806 bump fedora and alpine xorg versions

---
 builder/build.sh                            |  8 ++++----
 builder/dockerfile.alpine_317.build         |  2 +-
 builder/dockerfile.fedora_thirtyseven.build | 21 +++++++++++++++++++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/builder/build.sh b/builder/build.sh
index eb92158..b20f7a3 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -47,7 +47,7 @@ cd /tmp
 # default to the version of x in Ubuntu 18.04, otherwise caller will need to specify
 XORG_VER=${XORG_VER:-"1.19.6"}
 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
 #cd kasmvnc
@@ -64,7 +64,7 @@ cmake -D CMAKE_BUILD_TYPE=RelWithDebInfo . -DBUILD_VIEWER:BOOL=OFF \
   -DENABLE_GNUTLS:BOOL=OFF
 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
 patch -Np1 -i ../xserver${XORG_PATCH}.patch
@@ -99,8 +99,8 @@ fi
     --disable-config-hal \
     --disable-config-udev \
     --disable-dmx \
-    --disable-dri \
-    --disable-dri2 \
+    --enable-dri \
+    --enable-dri2 \
     --disable-kdrive \
     --disable-static \
     --disable-xephyr \
diff --git a/builder/dockerfile.alpine_317.build b/builder/dockerfile.alpine_317.build
index 5450db9..6e44049 100644
--- a/builder/dockerfile.alpine_317.build
+++ b/builder/dockerfile.alpine_317.build
@@ -2,7 +2,7 @@ FROM alpine:3.17
 
 ENV KASMVNC_BUILD_OS alpine
 ENV KASMVNC_BUILD_OS_CODENAME 317
-ENV XORG_VER 1.20.7
+ENV XORG_VER 1.20.14
 
 RUN \
   echo "**** install build deps ****" && \
diff --git a/builder/dockerfile.fedora_thirtyseven.build b/builder/dockerfile.fedora_thirtyseven.build
index 489c33e..e3c75b4 100644
--- a/builder/dockerfile.fedora_thirtyseven.build
+++ b/builder/dockerfile.fedora_thirtyseven.build
@@ -2,22 +2,34 @@ FROM fedora:37
 
 ENV KASMVNC_BUILD_OS fedora
 ENV KASMVNC_BUILD_OS_CODENAME thirtyseven
-ENV XORG_VER 1.20.7
+ENV XORG_VER 1.20.14
 
 RUN \
   echo "**** install build deps ****" && \
+  dnf group install -y \
+    "C Development Tools and Libraries" \
+    "Development Tools" && \
   dnf install -y \
     autoconf \
     automake \
+    bison \
+    byacc \
     bzip2 \
     cmake \
+    diffutils \
+    doxygen \
+    file \
+    flex \
+    fop \
     gcc \
     gcc-c++ \
     git \
+    glibc-devel \
     libdrm-devel \
     libepoxy-devel \
     libjpeg-turbo-devel \
     libjpeg-turbo-static \
+    libmd-devel \
     libpciaccess-devel \
     libtool \
     libwebp-devel \
@@ -37,12 +49,15 @@ RUN \
     mesa-libgbm-devel \
     mesa-libGL-devel \
     meson \
+    mingw64-binutils \
+    mt-st \
     nettle-devel \
     openssl-devel \
     patch \
     pixman-devel \
     wayland-devel \
     wget \
+    which \
     xcb-util-devel \
     xcb-util-image-devel \
     xcb-util-keysyms-devel \
@@ -52,11 +67,13 @@ RUN \
     xkbcomp \
     xkbcomp-devel \
     xkeyboard-config \
+    xmlto \
     xorg-x11-font-utils \
     xorg-x11-proto-devel \
     xorg-x11-server-common \
     xorg-x11-server-devel \
-    xorg-x11-xtrans-devel
+    xorg-x11-xtrans-devel \
+    xsltproc
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd