frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1654) 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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-30 14:30:46 +02:00
parent 8c5153f0f8
commit 810e55893e
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -21,10 +21,10 @@ variables:
REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git'
XORG_DEBIAN_VERSION: 'bullseye-slim' XORG_DEBIAN_VERSION: 'bullseye-slim'
XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' 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_VERSION: '14.2'
XORG_FREEBSD_EXEC: '' XORG_FREEBSD_EXEC: ''
XORG_FREEBSD_TAG: '2025-02-18-xvmc' XORG_FREEBSD_TAG: '2025-05-27-xcb'
include: include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'
@ -111,7 +111,7 @@ stages:
FDO_DISTRIBUTION_TAG: '$XORG_FREEBSD_TAG' FDO_DISTRIBUTION_TAG: '$XORG_FREEBSD_TAG'
FDO_DISTRIBUTION_VERSION: '$XORG_FREEBSD_VERSION' FDO_DISTRIBUTION_VERSION: '$XORG_FREEBSD_VERSION'
FDO_DISTRIBUTION_EXEC: '' 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' FDO_IMAGE_SIZE: '30G'
debian-bullseye: debian-bullseye:
@ -221,6 +221,8 @@ freebsd:
- /app/vmctl start - /app/vmctl start
- set +e - set +e
- scp -r $PWD "vm:" - 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 # 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/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 - /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

1
hw/xnest/Xnest.h
View File

@ -70,6 +70,7 @@ typedef XID KeySym64;
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#include <X11/Xlib-xcb.h>
#ifdef _XSERVER64_tmp #ifdef _XSERVER64_tmp
#define _XSERVER64 #define _XSERVER64

5
hw/xnest/meson.build
View File

@ -19,6 +19,9 @@ srcs = [
'../../mi/miinitext.h', '../../mi/miinitext.h',
] ]
x11_xcb_dep = dependency('x11-xcb', required: true)
xcb_dep = dependency('xcb', required: true)
executable( executable(
'Xnest', 'Xnest',
srcs, srcs,
@ -26,6 +29,8 @@ executable(
dependencies: [ dependencies: [
common_dep, common_dep,
xnest_dep, xnest_dep,
xcb_dep,
x11_xcb_dep,
], ],
link_with: [ link_with: [
libxserver_main, libxserver_main,