From 20a9ed60f065e2687decff9f426a914e0a4ad9fc Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 30 Jul 2024 14:30:46 +0200
Subject: [PATCH] Xnest: add xcb and x11-xcb as dependency

In order to transition to XCB, we need to link xcb, but temporarily
also x11-xcb.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 .gitlab-ci.yml       | 8 +++++---
 hw/xnest/Xnest.h     | 1 +
 hw/xnest/meson.build | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9f600da1..607e8ce74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,10 +21,10 @@ 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-27-xvmc'
+    XORG_DEBIAN_TAG:      '2025-05-27-xcb'
     XORG_FREEBSD_VERSION: '14.2'
     XORG_FREEBSD_EXEC:    ''
-    XORG_FREEBSD_TAG:     '2025-02-18-xvmc'
+    XORG_FREEBSD_TAG:     '2025-05-27-xcb'
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -111,7 +111,7 @@ stages:
     FDO_DISTRIBUTION_TAG:       '$XORG_FREEBSD_TAG'
     FDO_DISTRIBUTION_VERSION:   '$XORG_FREEBSD_VERSION'
     FDO_DISTRIBUTION_EXEC:      ''
-    FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim libxvmc'
+    FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim libxvmc xcb-util xcb-util-wm'
     FDO_IMAGE_SIZE:             '30G'
 
 debian-bullseye:
@@ -221,6 +221,8 @@ freebsd:
       - /app/vmctl start
       - set +e
       - scp -r $PWD "vm:"
+      # need to install extra packages, as long as image cant be rebuilt
+      - /app/vmctl exec "pkg update && pkg add libxvmc xcb-util xcb-util-wm"
       # need to install newer xorgproto
       - /app/vmctl exec "cd $CI_PROJECT_NAME/dep.xorgproto && ./autogen.sh --prefix=/usr && make && make install"
       - /app/vmctl exec "cd $CI_PROJECT_NAME && PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" MESON_ARGS=\"$MESON_ARGS\" MESON_BUILDDIR=\"$MESON_BUILDDIR\" .gitlab-ci/meson-build.sh --skip-test" && touch .success
diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h
index 71606f583..8fd0066c2 100644
--- a/hw/xnest/Xnest.h
+++ b/hw/xnest/Xnest.h
@@ -70,6 +70,7 @@ typedef XID KeySym64;
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
+#include <X11/Xlib-xcb.h>
 
 #ifdef _XSERVER64_tmp
 #define _XSERVER64
diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build
index 1a981b906..9d70f1bdf 100644
--- a/hw/xnest/meson.build
+++ b/hw/xnest/meson.build
@@ -19,6 +19,9 @@ srcs = [
     '../../mi/miinitext.h',
 ]
 
+x11_xcb_dep = dependency('x11-xcb', required: true)
+xcb_dep = dependency('xcb', required: true)
+
 executable(
     'Xnest',
     srcs,
@@ -26,6 +29,8 @@ executable(
     dependencies: [
         common_dep,
         xnest_dep,
+        xcb_dep,
+        x11_xcb_dep,
     ],
     link_with: [
         libxserver_main,