mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
.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:
committed by
Enrico Weigelt
parent
af0de5a0f4
commit
1d27e2878a
13
.github/scripts/install-prereq-drivers.sh
vendored
Executable file
13
.github/scripts/install-prereq-drivers.sh
vendored
Executable 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
|
||||||
3
.github/scripts/ubuntu/install-pkg.sh
vendored
3
.github/scripts/ubuntu/install-pkg.sh
vendored
@@ -91,4 +91,5 @@ apt-get install -y \
|
|||||||
xkb-data \
|
xkb-data \
|
||||||
xutils-dev \
|
xutils-dev \
|
||||||
libxaw7-dev \
|
libxaw7-dev \
|
||||||
python3-mako
|
python3-mako \
|
||||||
|
libxcvt-dev
|
||||||
|
|||||||
4
.github/workflows/build-xserver.yml
vendored
4
.github/workflows/build-xserver.yml
vendored
@@ -78,7 +78,7 @@ jobs:
|
|||||||
|
|
||||||
drivers-build-ubuntu:
|
drivers-build-ubuntu:
|
||||||
env:
|
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
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repository code
|
- name: Check out repository code
|
||||||
@@ -112,7 +112,7 @@ jobs:
|
|||||||
restore-keys: ${{ runner.name }}-x11-deps-
|
restore-keys: ${{ runner.name }}-x11-deps-
|
||||||
|
|
||||||
- name: generic prereq
|
- name: generic prereq
|
||||||
run: .github/scripts/install-prereq.sh
|
run: .github/scripts/install-prereq-drivers.sh
|
||||||
|
|
||||||
- name: build xserver sdk
|
- name: build xserver sdk
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -250,10 +250,10 @@ endif
|
|||||||
|
|
||||||
if build_xorg
|
if build_xorg
|
||||||
build_xorg_sdk = true
|
build_xorg_sdk = true
|
||||||
|
libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
|
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
|
## configure Xnest - nesting X server
|
||||||
build_xnest = get_option('xnest') != 'false'
|
build_xnest = get_option('xnest') != 'false'
|
||||||
|
|||||||
Reference in New Issue
Block a user