From 90f6cd57e41ae72e4c4dec667d819f72dc148e9f Mon Sep 17 00:00:00 2001
From: Linn Mattsson <linma@cendio.se>
Date: Mon, 11 Dec 2023 14:06:49 +0100
Subject: [PATCH 1/4] Add missing requirements to BUILDING.txt

---
 BUILDING.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 4a83ef61c1..8ddf845d8b 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -9,6 +9,8 @@ Build Requirements (All Systems)
 
 -- CMake (http://www.cmake.org) v3.10 or later
 
+-- gcc
+
 -- zlib
 
 -- pixman
@@ -36,12 +38,13 @@ Build Requirements (Unix)
 =========================
 
 -- Non-Mac platforms:
-   * X11 development kit
+   * Development kits for all standard X11 libraries
    * PAM
 
 -- If building Xvnc/libvnc.so:
    * Xorg server source code, 1.16 or later
    * All build requirements Xorg imposes (see its documentation)
+   * patch
 
 -- Optional ffmpeg support (libav)
 

From 08f3b20d88dcc50b891e2cc36b7c92d312856a57 Mon Sep 17 00:00:00 2001
From: Linn Mattsson <linma@cendio.se>
Date: Mon, 11 Dec 2023 14:07:54 +0100
Subject: [PATCH 2/4] Clarify details about requirements in BUILDING.txt

---
 BUILDING.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 8ddf845d8b..d475dc428c 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -11,6 +11,8 @@ Build Requirements (All Systems)
 
 -- gcc
 
+Development kits for the following packages:
+
 -- zlib
 
 -- pixman
@@ -46,7 +48,9 @@ Build Requirements (Unix)
    * All build requirements Xorg imposes (see its documentation)
    * patch
 
--- Optional ffmpeg support (libav)
+-- Optional ffmpeg development kit support (libav)
+   * You might have to enable additional repositories for this. E.g.,
+     on RHEL, EPEL and RPMFusion (free + nonfree) need to be enabled.
 
 ============================
 Build Requirements (Windows)

From f8bdc1ea59660b67a290c7b108a9aa6122a92269 Mon Sep 17 00:00:00 2001
From: Linn Mattsson <linma@cendio.se>
Date: Mon, 11 Dec 2023 14:09:17 +0100
Subject: [PATCH 3/4] Remove unnecessary step from building the server

It seems this folder is created when building the vncviewer, which has
to be built before the server.
---
 BUILDING.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index d475dc428c..70e93bad04 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -119,7 +119,6 @@ that the viewer has already been built, per above.)
   > cd {build_directory}
 
     If performing an out-of-tree build:
-  > mkdir unix
   > cp -R {source_directory}/unix/xserver unix/
 
   > cp -R {xorg_source}/* unix/xserver/

From 11399936ce400981d89c0a6fea4482e14374175b Mon Sep 17 00:00:00 2001
From: Linn Mattsson <linma@cendio.se>
Date: Mon, 11 Dec 2023 14:12:18 +0100
Subject: [PATCH 4/4] Update server configure example to RHEL 9

Some of the flags have been removed and we don't need to consider 32-bit
libraries anymore.
---
 BUILDING.txt | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 70e93bad04..bfcad5b940 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -137,20 +137,17 @@ that the viewer has already been built, per above.)
   > ./configure --with-pic --without-dtrace --disable-static --disable-dri \
       --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
       --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
-      --disable-config-dbus --disable-config-hal --disable-config-udev \
-      --disable-dri2 --enable-install-libxf86config --enable-glx \
+      --disable-config-hal --disable-config-udev --disable-dri2 --enable-glx \
       --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
-      --with-fontdir=/usr/share/X11/fonts \
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
       --with-xkb-bin-directory=/usr/bin \
-      --with-serverconfig-path=/usr/lib[64]/xorg \
-      --with-dri-driver-path=/usr/lib[64]/dri \
+      --with-serverconfig-path=/usr/lib64/xorg \
       {additional configure options}
     (NOTE: This is merely an example that works with Red Hat Enterprise/CentOS
-    6 and recent Fedora releases.  You should customize it for your particular
-    system.  In particular, it will be necessary to customize the font, XKB,
-    and DRI directories.)
+    9 and recent Fedora releases.  You should customize it for your particular
+    system.  In particular, it will be necessary to customize the XKB
+    directory.)
 
     For a regular, in-tree build:
   > make TIGERVNC_SRCDIR={source_directory}