.github: build drivers against xorg-sdk without actual Xserver compile

Use the new xorg-sdk build type instead of building a complete Xserver,
to compile our drivers against.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-02-13 14:59:17 +01:00
committed by Enrico Weigelt
parent af0de5a0f4
commit 1d27e2878a
4 changed files with 18 additions and 4 deletions

13
.github/scripts/install-prereq-drivers.sh vendored Executable file
View File

@@ -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

View File

@@ -91,4 +91,5 @@ apt-get install -y \
xkb-data \
xutils-dev \
libxaw7-dev \
python3-mako
python3-mako \
libxcvt-dev

View File

@@ -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: |

View File

@@ -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'