xserver: Branch 'master' - 6 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Jul 2 04:38:02 UTC 2022
.gitlab-ci.yml | 6 +++---
.gitlab-ci/cross-prereqs-build.sh | 6 ++++--
.gitlab-ci/debian-install.sh | 36 ++++++------------------------------
meson.build | 2 +-
os/meson.build | 2 +-
5 files changed, 15 insertions(+), 37 deletions(-)
New commits:
commit 96e682f128a67b633ba4783a722b8972879139ce
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Jun 20 20:34:32 2022 -0700
meson: Bump requirement to meson-0.52.0
Bumped in response to warning from meson:
WARNING: Project specifies a minimum meson_version '>= 0.47.0' but uses features which were added in newer versions:
* 0.50.0: {'install arg in configure_file'}
Even though there is no warning, we need 0.52.0 for include_type (added in 8264b51e8e8b4c193dc8324cae4f9f675cfbf172) per:
https://mesonbuild.com/Reference-manual_functions.html#arguments17
diff --git a/meson.build b/meson.build
index 7bcec7d4e..0b129cc80 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.47.0',
+ meson_version: '>= 0.52.0',
)
release_date = '2021-07-05'
commit e2dcf31059a82ca41e95d41518710fccde19670a
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Tue Jun 21 12:21:34 2022 -0700
CI: Update gitlab CI to use debian bullseye
Also install xkbcomp, libwayland-dev, and weston from debian since it is new enough now
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15be58bec..bd2effcb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,9 @@
# using the same tag.
variables:
FDO_UPSTREAM_REPO: xorg/xserver
- FDO_DISTRIBUTION_VERSION: buster-slim
+ FDO_DISTRIBUTION_VERSION: bullseye-slim
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
- FDO_DISTRIBUTION_TAG: "2022-05-04.1"
+ FDO_DISTRIBUTION_TAG: "2022-07-01"
include:
- project: 'freedesktop/ci-templates'
@@ -31,7 +31,7 @@ stages:
# Cancel CI run if a newer commit is pushed to the same branch
interruptible: true
-debian-buster:
+debian-bullseye:
extends:
- .fdo.container-build at debian
- .ci-run-policy
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 26aa26c2f..f8f83b701 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -57,6 +57,7 @@ apt-get install -y \
libtool \
libudev-dev \
libunwind-dev \
+ libwayland-dev \
libx11-dev \
libx11-xcb-dev \
libxau-dev \
@@ -101,6 +102,7 @@ apt-get install -y \
python3-mako \
python3-numpy \
python3-six \
+ x11-xkb-utils \
xfonts-utils \
xkb-data \
xtrans-dev \
@@ -126,15 +128,7 @@ make -j${FDO_CI_CONCURRENT:-4} install
popd
rm -rf xorgproto
-# weston 9.0 requires libwayland >= 1.18
-git clone https://gitlab.freedesktop.org/wayland/wayland.git --depth 1 --branch=1.18.0
-cd wayland
-meson _build -D{documentation,dtd_validation}=false
-ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
-cd ..
-rm -rf wayland
-
-# Xwayland requires wayland-protocols >= 1.22, but Debian buster has 1.17 only
+# Xwayland requires wayland-protocols >= 1.22, but Debian bullseye has 1.20 only
git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.22
cd wayland-protocols
./autogen.sh
@@ -142,18 +136,6 @@ make -j${FDO_CI_CONCURRENT:-4} install
cd ..
rm -rf wayland-protocols
-# Xwayland requires weston > 5.0, but Debian buster has 5.0 only
-git clone https://gitlab.freedesktop.org/wayland/weston.git --depth 1 --branch=9.0
-cd weston
-meson _build -Dbackend-{drm,drm-screencast-vaapi,fbdev,rdp,wayland,x11}=false \
- -Dbackend-default=headless -Dcolor-management-{colord,lcms}=false \
- -Ddemo-clients=false -Dimage-{jpeg,webp}=false \
- -D{pipewire,remoting,screenshare,test-junit-xml,wcap-decode,weston-launch,xwayland}=false \
- -Dshell-{fullscreen,ivi,kiosk}=false -Dsimple-clients=
-ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
-cd ..
-rm -rf weston
-
# Install libdecor for Xwayland
git clone https://gitlab.gnome.org/jadahl/libdecor.git --depth 1 --branch=0.1.0
cd libdecor
@@ -186,14 +168,6 @@ echo 'path=/root/xts' >> piglit/piglit.conf
find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xargs rm
strip xts/xts5/*/.libs/*
-# Running meson dist requires xkbcomp 1.4.1 or newer, but Debian buster has 1.4.0 only
-git clone https://gitlab.freedesktop.org/xorg/app/xkbcomp.git --depth 1 --branch=xkbcomp-1.4.1
-cd xkbcomp
-./autogen.sh --datarootdir=/usr/share
-make -j${FDO_CI_CONCURRENT:-4} install
-cd ..
-rm -rf xkbcomp
-
apt-get purge -y \
$EPHEMERAL
commit 3288149096bdbd105811cca95989657d0c5d65d3
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Tue Jun 21 16:30:03 2022 -0700
CI: Use -fcommon to build xtst
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index e931c6790..26aa26c2f 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -166,7 +166,9 @@ git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1
git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1
cd xts
-./autogen.sh
+# Using -fcommon until we get a proper fix into xtst.
+# See discussion at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913
+CFLAGS=-fcommon ./autogen.sh
xvfb-run make -j${FDO_CI_CONCURRENT:-4}
cd ..
commit ecce57c3320944db9abf2d467063ed5a8c57a4b1
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Tue Jun 21 15:53:27 2022 -0700
CI: Use -fcommon to build libX11 for mingw
See discussions at https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/140
and https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh
index 53cf8259f..c3502e932 100755
--- a/.gitlab-ci/cross-prereqs-build.sh
+++ b/.gitlab-ci/cross-prereqs-build.sh
@@ -56,7 +56,9 @@ build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'libxcb-1.14'
build 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git' 'xtrans-1.4.0'
# the default value of keysymdefdir is taken from the includedir variable for
# xproto, which isn't adjusted by pkg-config for the sysroot
-build 'https://gitlab.freedesktop.org/xorg/lib/libX11.git' 'libX11-1.6.9' "--with-keysymdefdir=/usr/${HOST}/include/X11"
+# Using -fcommon to address build failure when cross-compiling for windows.
+# See discussion at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913
+CFLAGS="-fcommon" build 'https://gitlab.freedesktop.org/xorg/lib/libX11.git' 'libX11-1.6.9' "--with-keysymdefdir=/usr/${HOST}/include/X11"
build 'https://gitlab.freedesktop.org/xorg/lib/libxkbfile.git' 'libxkbfile-1.1.0'
# freetype needs an explicit --build to know it's cross-compiling
# disable png as freetype tries to use libpng-config, even when cross-compiling
commit 4fe4f17804d7845c29e03dac16b1294651c34884
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Tue Jun 21 13:33:47 2022 -0700
CI: Update to xcb-proto-1.14.1 to support python 3.9
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh
index 4596667a1..53cf8259f 100755
--- a/.gitlab-ci/cross-prereqs-build.sh
+++ b/.gitlab-ci/cross-prereqs-build.sh
@@ -51,7 +51,7 @@ build 'https://gitlab.freedesktop.org/xorg/lib/pthread-stubs.git' '0.4'
# these would add -I/usr/include to CFLAGS, which breaks cross-compilation
build 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' 'xorgproto-2021.4.99.2' '--datadir=/lib'
build 'https://gitlab.freedesktop.org/xorg/lib/libXau.git' 'libXau-1.0.9'
-build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.git' 'xcb-proto-1.14'
+build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.git' 'xcb-proto-1.14.1'
build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'libxcb-1.14'
build 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git' 'xtrans-1.4.0'
# the default value of keysymdefdir is taken from the includedir variable for
commit 191e79afea713cdea52ec9d870d0f18b43345133
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Jun 22 23:43:01 2022 -0700
meson: Use system method for locating tirpc
This avoids warnings from system headers when building with debian bullseye:
In file included from ../dist-unpack/xserver-21.1.99.1/os/rpcauth.c:47:
/usr/include/tirpc/rpc/rpc.h:83:12: error: redundant redeclaration of ‘bindresvport’ [-Werror=redundant-decls]
83 | extern int bindresvport(int, struct sockaddr_in *);
| ^~~~~~~~~~~~
In file included from /usr/include/tirpc/rpc/rpc.h:40,
from ../dist-unpack/xserver-21.1.99.1/os/rpcauth.c:47:
/usr/include/netinet/in.h:503:12: note: previous declaration of ‘bindresvport’ was here
503 | extern int bindresvport (int __sockfd, struct sockaddr_in *__sock_in) __THROW;
| ^~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/os/meson.build b/os/meson.build
index ab28fc4ed..85b445f20 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -58,7 +58,7 @@ rpc_dep = []
if get_option('secure-rpc')
# prefer libtirpc (if available), otherwise ensure RPC functions are
# provided by libc.
- rpc_dep = dependency('libtirpc', required: false)
+ rpc_dep = dependency('libtirpc', required: false, include_type: 'system')
if not (rpc_dep.found() or cc.has_header('rpc/rpc.h'))
error('secure-rpc requested, but neither libtirpc or libc RPC support were found')
endif
More information about the xorg-commit
mailing list