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

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 <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-11-05 15:51:46 +01:00
parent 6080bcf5b8
commit 6a0c1a7d9f
14 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.appveyor.yml
View File

@ -64,8 +64,7 @@ font-util,\
khronos-opengl-registry,\ khronos-opengl-registry,\
python38-lxml,\ python38-lxml,\
xkbcomp-devel,\ xkbcomp-devel,\
xkeyboard-config,\ xkeyboard-config"
xtrans"
- echo Install done - echo Install done
- "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g" - "%CYGWIN_ROOT%\\%SETUP% -qnNdO -R %CYGWIN_ROOT% -s %CYGWIN_MIRROR% -l %CACHE% -g"
cache: cache:

2
.gitlab-ci.yml
View File

@ -108,7 +108,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 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' FDO_IMAGE_SIZE: '30G'
debian-bullseye: debian-bullseye:

1
.gitlab-ci/cross-prereqs-build.sh
View File

@ -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/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/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/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 # the default value of keysymdefdir is taken from the includedir variable for
# xproto, which isn't adjusted by pkg-config for the sysroot # xproto, which isn't adjusted by pkg-config for the sysroot
# Using -fcommon to address build failure when cross-compiling for windows. # Using -fcommon to address build failure when cross-compiling for windows.

1
.gitlab-ci/debian-install.sh
View File

@ -122,7 +122,6 @@ apt-get install -y \
x11-xkb-utils \ x11-xkb-utils \
xfonts-utils \ xfonts-utils \
xkb-data \ xkb-data \
xtrans-dev \
xutils-dev xutils-dev
.gitlab-ci/cross-prereqs-build.sh i686-w64-mingw32 .gitlab-ci/cross-prereqs-build.sh i686-w64-mingw32

2
hw/xwin/windisplay.c
View File

@ -37,7 +37,7 @@
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#include <X11/Xtrans/Xtrans.h> #include "os/Xtrans.h"
/* /*
Generate a display name string referring to the display of this server, Generate a display name string referring to the display of this server,

2
meson.build
View File

@ -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']) xcmiscproto_dep = dependency('xcmiscproto', version: '>= 1.2.0', fallback: ['xorgproto', 'ext_xorgproto'])
bigreqsproto_dep = dependency('bigreqsproto', version: '>= 1.1.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']) 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']) videoproto_dep = dependency('videoproto', fallback: ['xorgproto', 'ext_xorgproto'])
compositeproto_dep = dependency('compositeproto', version: '>= 0.4', fallback: ['xorgproto', 'ext_xorgproto']) compositeproto_dep = dependency('compositeproto', version: '>= 0.4', fallback: ['xorgproto', 'ext_xorgproto'])
@ -578,7 +577,6 @@ common_dep = [
xcmiscproto_dep, xcmiscproto_dep,
bigreqsproto_dep, bigreqsproto_dep,
presentproto_dep, presentproto_dep,
xtrans_dep,
libsystemd_daemon_dep, libsystemd_daemon_dep,
videoproto_dep, videoproto_dep,

2
os/Xtransint.h
View File

@ -76,7 +76,7 @@ from The Open Group.
# define _WILLWINSOCK_ # define _WILLWINSOCK_
#endif #endif
#include "Xtrans.h" #include "os/Xtrans.h"
#ifndef _X_UNUSED /* Defined in Xfuncproto.h in xproto >= 7.0.22 */ #ifndef _X_UNUSED /* Defined in Xfuncproto.h in xproto >= 7.0.22 */
# define _X_UNUSED /* */ # define _X_UNUSED /* */

2
os/access.c
View File

@ -87,7 +87,7 @@ SOFTWARE.
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h> #include "os/Xtrans.h"
#include <X11/Xauth.h> #include <X11/Xauth.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>

4
os/connection.c
View File

@ -70,8 +70,8 @@ SOFTWARE.
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h> #include "os/Xtrans.h"
#include <X11/Xtrans/Xtransint.h> #include "os/Xtransint.h"
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>

2
os/io.c
View File

@ -64,7 +64,7 @@ SOFTWARE.
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h> #include "os/Xtrans.h"
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <errno.h> #include <errno.h>
#if !defined(WIN32) #if !defined(WIN32)

2
os/utils.c
View File

@ -65,7 +65,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h> #include "os/Xtrans.h"
#include <libgen.h> #include <libgen.h>

2
os/xdmauth.c
View File

@ -40,9 +40,9 @@ from The Open Group.
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include "os/auth.h" #include "os/auth.h"
#include "os/Xtrans.h"
#include "os.h" #include "os.h"
#include "osdep.h" #include "osdep.h"

4
os/xdmcp.c
View File

@ -20,7 +20,7 @@
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h> #include "os/Xtrans.h"
#endif #endif
#include <X11/Xos.h> #include <X11/Xos.h>
@ -51,7 +51,7 @@
#define XSERV_t #define XSERV_t
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h> #include "os/Xtrans.h"
#ifdef XDMCP #ifdef XDMCP
#undef REQUEST #undef REQUEST

2
os/xstrans.c
View File

@ -5,4 +5,4 @@
#define TRANS_REOPEN #define TRANS_REOPEN
#define TRANS_SERVER #define TRANS_SERVER
#define XSERV_t #define XSERV_t
#include <X11/Xtrans/transport.c> #include "os/transport.c"