From 6a0c1a7d9f30a1b750fc8eb673b16274fd82c432 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Nov 2024 15:51:46 +0100 Subject: [PATCH] os: use internal xtrans instead of external library Now that we've got xtrans bundled in our source tree, use this one and drop the external dependency. Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/691 Signed-off-by: Enrico Weigelt, metux IT consult --- .appveyor.yml | 3 +-- .gitlab-ci.yml | 2 +- .gitlab-ci/cross-prereqs-build.sh | 1 - .gitlab-ci/debian-install.sh | 1 - hw/xwin/windisplay.c | 2 +- meson.build | 2 -- os/Xtransint.h | 2 +- os/access.c | 2 +- os/connection.c | 4 ++-- os/io.c | 2 +- os/utils.c | 2 +- os/xdmauth.c | 2 +- os/xdmcp.c | 4 ++-- os/xstrans.c | 2 +- 14 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c023790cf..a925a84b7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -64,8 +64,7 @@ font-util,\ khronos-opengl-registry,\ python38-lxml,\ xkbcomp-devel,\ -xkeyboard-config,\ -xtrans" +xkeyboard-config" - echo Install done - "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g" cache: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f208bd119..c6420f9c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,7 +108,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 xcb-util xcb-util-wm' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util libepoll-shim libxvmc xcb-util xcb-util-wm' FDO_IMAGE_SIZE: '30G' debian-bullseye: diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh index fb788895b..2c1f3464a 100755 --- a/.gitlab-ci/cross-prereqs-build.sh +++ b/.gitlab-ci/cross-prereqs-build.sh @@ -53,7 +53,6 @@ build 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' 'xorgproto-2024. 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.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 # xproto, which isn't adjusted by pkg-config for the sysroot # Using -fcommon to address build failure when cross-compiling for windows. diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index ff4f62eb2..b505d45a1 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -122,7 +122,6 @@ apt-get install -y \ x11-xkb-utils \ xfonts-utils \ xkb-data \ - xtrans-dev \ xutils-dev .gitlab-ci/cross-prereqs-build.sh i686-w64-mingw32 diff --git a/hw/xwin/windisplay.c b/hw/xwin/windisplay.c index 52ece1d88..637ab0283 100644 --- a/hw/xwin/windisplay.c +++ b/hw/xwin/windisplay.c @@ -37,7 +37,7 @@ #define XSERV_t #define TRANS_SERVER -#include +#include "os/Xtrans.h" /* Generate a display name string referring to the display of this server, diff --git a/meson.build b/meson.build index 2a5500635..c579f207e 100644 --- a/meson.build +++ b/meson.build @@ -83,7 +83,6 @@ damageproto_dep = dependency('damageproto', version: '>= 1.1', fallback: ['xorgp xcmiscproto_dep = dependency('xcmiscproto', version: '>= 1.2.0', fallback: ['xorgproto', 'ext_xorgproto']) bigreqsproto_dep = dependency('bigreqsproto', version: '>= 1.1.0', fallback: ['xorgproto', 'ext_xorgproto']) presentproto_dep = dependency('presentproto', version: '>= 1.4', fallback: ['xorgproto', 'ext_xorgproto']) -xtrans_dep = dependency('xtrans', version: '>= 1.3.5') videoproto_dep = dependency('videoproto', fallback: ['xorgproto', 'ext_xorgproto']) compositeproto_dep = dependency('compositeproto', version: '>= 0.4', fallback: ['xorgproto', 'ext_xorgproto']) @@ -578,7 +577,6 @@ common_dep = [ xcmiscproto_dep, bigreqsproto_dep, presentproto_dep, - xtrans_dep, libsystemd_daemon_dep, videoproto_dep, diff --git a/os/Xtransint.h b/os/Xtransint.h index 82c8755c8..13a668ba3 100644 --- a/os/Xtransint.h +++ b/os/Xtransint.h @@ -76,7 +76,7 @@ from The Open Group. # define _WILLWINSOCK_ #endif -#include "Xtrans.h" +#include "os/Xtrans.h" #ifndef _X_UNUSED /* Defined in Xfuncproto.h in xproto >= 7.0.22 */ # define _X_UNUSED /* */ diff --git a/os/access.c b/os/access.c index 34d735bfa..ce74eafbc 100644 --- a/os/access.c +++ b/os/access.c @@ -87,7 +87,7 @@ SOFTWARE. #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include +#include "os/Xtrans.h" #include #include #include diff --git a/os/connection.c b/os/connection.c index 64245af6b..cee77fa9f 100644 --- a/os/connection.c +++ b/os/connection.c @@ -70,8 +70,8 @@ SOFTWARE. #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include -#include +#include "os/Xtrans.h" +#include "os/Xtransint.h" #include #include #include diff --git a/os/io.c b/os/io.c index 948660996..10a666c0c 100644 --- a/os/io.c +++ b/os/io.c @@ -64,7 +64,7 @@ SOFTWARE. #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include +#include "os/Xtrans.h" #include #include #if !defined(WIN32) diff --git a/os/utils.c b/os/utils.c index 00c6ebb3e..198e3e0cc 100644 --- a/os/utils.c +++ b/os/utils.c @@ -65,7 +65,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include +#include "os/Xtrans.h" #include diff --git a/os/xdmauth.c b/os/xdmauth.c index fc5cbe5c5..8f30ef946 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -40,9 +40,9 @@ from The Open Group. #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include #include "os/auth.h" +#include "os/Xtrans.h" #include "os.h" #include "osdep.h" diff --git a/os/xdmcp.c b/os/xdmcp.c index 550979e51..3168d8608 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -20,7 +20,7 @@ #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include +#include "os/Xtrans.h" #endif #include @@ -51,7 +51,7 @@ #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include +#include "os/Xtrans.h" #ifdef XDMCP #undef REQUEST diff --git a/os/xstrans.c b/os/xstrans.c index c9363db71..bd60a18be 100644 --- a/os/xstrans.c +++ b/os/xstrans.c @@ -5,4 +5,4 @@ #define TRANS_REOPEN #define TRANS_SERVER #define XSERV_t -#include +#include "os/transport.c"