xserver: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml                    |    2 +-
 .gitlab-ci/cross-prereqs-build.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9929f64ec8140b5734e9b97822d0f548a4c9c29a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Aug 14 11:42:59 2024 +0200

    ci: fix w64 cross build pkg-config path
    
    pkg-config path is wrong: it's using /usr/share/pkgconfig from the *host*
    instead of sysroot, which is leading to wrong pathes.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1655>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2926d6d4..539230225 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
     FDO_UPSTREAM_REPO: xorg/xserver
     FDO_DISTRIBUTION_VERSION: bullseye-slim
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
-    FDO_DISTRIBUTION_TAG: "2024-03-26-explicit-sync-2"
+    FDO_DISTRIBUTION_TAG: "2024-08-23-fix-cross"
     MESON_BUILDDIR: "build"
 
 include:
diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh
index 916d95a3d..8f567e10d 100755
--- a/.gitlab-ci/cross-prereqs-build.sh
+++ b/.gitlab-ci/cross-prereqs-build.sh
@@ -11,7 +11,7 @@ HOST=$1
 cat >/usr/local/bin/${HOST}-pkg-config <<EOF
 #!/bin/sh
 
-PKG_CONFIG_SYSROOT_DIR=/usr/${HOST} PKG_CONFIG_LIBDIR=/usr/${HOST}/lib/pkgconfig:/usr/share/pkgconfig pkg-config \$@
+PKG_CONFIG_SYSROOT_DIR=/usr/${HOST} PKG_CONFIG_LIBDIR=/usr/${HOST}/lib/pkgconfig:/usr/${HOST}/share/pkgconfig pkg-config \$@
 EOF
 chmod +x /usr/local/bin/${HOST}-pkg-config