xserver: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml               |    2 +-
 .gitlab-ci/debian-install.sh |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 9af363b0462ef4e17ff741ffbf8ca3ae62971ceb
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Feb 12 12:06:59 2025 -0800

    ci: update XTS to a commit that doesn't require -fcommon workaround
    
    xorg/test/xts!10 fixed XTS to build with recent gcc without adding -fcommon
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1786>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed5b8c076..1ccb7c05c 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:      '2025-02-10-intel'
+    XORG_DEBIAN_TAG:      '2025-02-12-xts'
     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 87b1f4bbb..a3d3c29d4 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -191,10 +191,8 @@ cd ..
 
 git clone https://gitlab.freedesktop.org/xorg/test/xts
 cd xts
-git checkout dbbfa96c036e596346147081cbceda136e7c86c1
-# 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
+git checkout 12a887c2c72c4258962b56ced7b0aec782f1ffed
+./autogen.sh
 xvfb-run make -j${FDO_CI_CONCURRENT:-4}
 cd ..