xserver: Branch 'master' - 4 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Sep 9 15:57:17 UTC 2024
.gitlab-ci.yml | 2 +-
.gitlab-ci/debian-install.sh | 6 +++---
meson.build | 6 ++++--
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 4accb821f2eba2ae7992a90d11856216c02fbfa2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Sep 9 07:48:07 2024 -0700
meson: list required version of xproto headers in xorg-server.pc
Many of the SDK headers use the _X_* helper macros from Xfuncproto.h,
so list a dependency on them so the right path & version are used when
building out-of-tree loadable modules such as drivers.
Raises required version of meson to 0.58.0 to support format strings.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
diff --git a/meson.build b/meson.build
index 4bc67bcbb..35f84ff07 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('xserver', 'c',
'c_std=gnu99',
],
version: '21.1.99.1',
- meson_version: '>= 0.56.0',
+ meson_version: '>= 0.58.0',
)
release_date = '2021-07-05'
@@ -63,6 +63,7 @@ add_project_arguments(common_wflags, language : ['c', 'objc'])
libdrm_req = '>= 2.4.116'
libselinux_req = '>= 2.0.86'
xext_req = '>= 1.0.99.4'
+xproto_req = '>= 7.0.31'
wayland_req = '>= 1.21.0'
wayland_protocols_req = '>= 1.34'
gbm_req = '>= 10.2'
@@ -70,7 +71,7 @@ xf86dgaproto_req = '>= 2.0.99.1'
xshmfence_req = '>= 1.1'
x11_dep = dependency('x11')
-xproto_dep = dependency('xproto', version: '>= 7.0.31', fallback: ['xorgproto', 'ext_xorgproto'])
+xproto_dep = dependency('xproto', version: xproto_req, fallback: ['xorgproto', 'ext_xorgproto'])
randrproto_dep = dependency('randrproto', version: '>= 1.6.0', fallback: ['xorgproto', 'ext_xorgproto'])
renderproto_dep = dependency('renderproto', version: '>= 0.11', fallback: ['xorgproto', 'ext_xorgproto'])
xextproto_dep = dependency('xextproto', version: '>= 7.2.99.901', fallback: ['xorgproto', 'ext_xorgproto'])
@@ -867,6 +868,7 @@ if build_xorg
sdk_required_modules = [
'pixman-1 >= 0.27.2',
+ f'xproto @xproto_req@',
]
# XXX this isn't trying very hard, but hard enough.
commit 3de2e27ccc4ba0659ae171188c636a04afc6e1f0
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Sep 9 07:47:32 2024 -0700
CI: update meson from 0.56.2 (bullseye) to 1.0.0 (bullseye-backports)
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 517536b5b..a2e4a8a57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git'
XORG_DEBIAN_VERSION: 'bullseye-slim'
XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
- XORG_DEBIAN_TAG: '2024-09-07-fix-anongit'
+ XORG_DEBIAN_TAG: '2024-09-09-meson-backport'
XORG_FREEBSD_VERSION: '14.0'
XORG_FREEBSD_EXEC: ''
XORG_FREEBSD_TAG: '2024-06-10.0'
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index bd3738a12..81cb4cb62 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -15,7 +15,7 @@ EPHEMERAL="
xvfb
"
-# Add bullseye-backports for the newer linux-libc-dev package
+# Add bullseye-backports for the newer linux-libc-dev & meson packages
echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list
apt update
@@ -99,7 +99,7 @@ apt-get install -y \
libz-mingw-w64-dev \
linux-libc-dev/bullseye-backports \
mesa-common-dev \
- meson \
+ meson/bullseye-backports \
mingw-w64-tools \
nettle-dev \
pkg-config \
commit 32adf434b7138dc3f11358d164d55333706a4873
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Sep 7 15:06:03 2024 -0700
CI: update libdecor from 0.1.0 to 0.1.1
The install_demo meson_option was added in
libdecor/libdecor at 7106f5e32986e2773df8199a194b152a2a2c0cab
which is in the 0.1.1 tag, but not 0.1.0.
If we upgrade the version of meson used in the CI to 1.0.0, then it fails
to build libdecor 0.1.0 with: ERROR: Unknown options: "install_demo"
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index c0fed5e6e..bd3738a12 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -160,7 +160,7 @@ cd ..
rm -rf wayland-protocols
# Install libdecor for Xwayland
-git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.0
+git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.1
cd libdecor
meson _build -D{demo,install_demo}=false
ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
commit fc8ba2441326dae03d7c223537430f860f061f81
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Sep 7 15:03:06 2024 -0700
CI: clone libdecor from fd.o instead of gnome.org
https://gitlab.gnome.org/jadahl/libdecor is archived and the README
says to use https://gitlab.freedesktop.org/libdecor/libdecor instead.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 59bcea4b0..c0fed5e6e 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -160,7 +160,7 @@ cd ..
rm -rf wayland-protocols
# Install libdecor for Xwayland
-git clone https://gitlab.gnome.org/jadahl/libdecor.git --depth 1 --branch=0.1.0
+git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.0
cd libdecor
meson _build -D{demo,install_demo}=false
ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
More information about the xorg-commit
mailing list