frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add libdrm 2.4.109 requirement 

Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Austin Shafer 2022-09-02 11:54:05 -04:00 committed by Olivier Fourdan
parent d5dd3f3cee
commit 5a742ab876
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ variables:
FDO_UPSTREAM_REPO: xorg/xserver FDO_UPSTREAM_REPO: xorg/xserver
FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_VERSION: bullseye-slim
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
FDO_DISTRIBUTION_TAG: "2022-11-24-new-wayland-protocols" FDO_DISTRIBUTION_TAG: "2023-01-25-libdrm-update"
include: include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'

8
.gitlab-ci/debian-install.sh
View File

@ -113,6 +113,14 @@ apt-get install -y \
cd /root cd /root
# Xwayland requires drm 2.4.109 for drmGetDeviceFromDevId
git clone https://gitlab.freedesktop.org/mesa/drm --depth 1 --branch=libdrm-2.4.109
cd drm
meson _build
ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
cd ..
rm -rf drm
# xserver requires libxcvt # xserver requires libxcvt
git clone https://gitlab.freedesktop.org/xorg/lib/libxcvt.git --depth 1 --branch=libxcvt-0.1.0 git clone https://gitlab.freedesktop.org/xorg/lib/libxcvt.git --depth 1 --branch=libxcvt-0.1.0
cd libxcvt cd libxcvt

2
meson.build
View File

@ -60,7 +60,7 @@ endforeach
add_project_arguments(common_wflags, language : ['c', 'objc']) add_project_arguments(common_wflags, language : ['c', 'objc'])
libdrm_req = '>= 2.4.89' libdrm_req = '>= 2.4.109'
libselinux_req = '>= 2.0.86' libselinux_req = '>= 2.0.86'
xext_req = '>= 1.0.99.4' xext_req = '>= 1.0.99.4'
wayland_req = '>= 1.21.0' wayland_req = '>= 1.21.0'