diff --git a/.github/scripts/install-prereq-drivers.sh b/.github/scripts/install-prereq-drivers.sh
new file mode 100755
index 0000000000..d7f53c324e
--- /dev/null
+++ b/.github/scripts/install-prereq-drivers.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+. .github/scripts/util.sh
+
+mkdir -p $X11_BUILD_DIR
+cd $X11_BUILD_DIR
+
+if [ "$X11_OS" = "Linux" ]; then
+build_meson   drm               $(fdo_mirror drm)                          libdrm-2.4.121   -Domap=enabled -Dfreedreno=enabled
+fi
+build_meson   xorgproto         $(fdo_mirror xorgproto)                    xorgproto-2024.1
diff --git a/.github/scripts/ubuntu/install-pkg.sh b/.github/scripts/ubuntu/install-pkg.sh
index 05df0800d5..edb7397e5d 100755
--- a/.github/scripts/ubuntu/install-pkg.sh
+++ b/.github/scripts/ubuntu/install-pkg.sh
@@ -91,4 +91,5 @@ apt-get install -y \
 	xkb-data \
 	xutils-dev \
 	libxaw7-dev \
-	python3-mako
+	python3-mako \
+	libxcvt-dev
diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index b42813dfa1..6c99655fc4 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -78,7 +78,7 @@ jobs:
 
     drivers-build-ubuntu:
         env:
-            MESON_ARGS: -Dprefix=/usr -Dxephyr=false -Dwerror=false -Dxcsecurity=false -Dxorg=true -Dxvfb=false -Dxnest=false -Dxfbdev=false
+            MESON_ARGS: -Dprefix=/usr -Dxorg-sdk=true -Dxorg=false -Dxephyr=false -Dwerror=false -Dxcsecurity=false -Dxorg=true -Dxvfb=false -Dxnest=false -Dxfbdev=false
         runs-on: ubuntu-latest
         steps:
             - name: Check out repository code
@@ -112,7 +112,7 @@ jobs:
                 restore-keys: ${{ runner.name }}-x11-deps-
 
             - name: generic prereq
-              run:  .github/scripts/install-prereq.sh
+              run:  .github/scripts/install-prereq-drivers.sh
 
             - name: build xserver sdk
               run:  |
diff --git a/meson.build b/meson.build
index 3ece0f6620..f2bcbf083a 100644
--- a/meson.build
+++ b/meson.build
@@ -250,10 +250,10 @@ endif
 
 if build_xorg
     build_xorg_sdk = true
+    libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
 endif
 
 xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
-libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
 
 ## configure Xnest - nesting X server
 build_xnest = get_option('xnest') != 'false'