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

Merge branch 'master' of https://github.com/xgui4/xserver

This commit is contained in:
xgui4 2025-07-03 18:53:37 -04:00
parent 026a6e0c5f 6dc4195035
commit f41e055b82
30 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/meson.build
View File

@ -58,13 +58,13 @@ if build_xv
hdrs_xext += ['xvdix.h', 'xvmcext.h']
endif
libxserver_xext = static_library('libxserver_xext',
libxserver_xext = static_library('xserver_xext',
srcs_xext,
include_directories: inc,
dependencies: common_dep,
)
libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
libxserver_xext_vidmode = static_library('xserver_xext_vidmode',
'vidmode.c',
include_directories: inc,
dependencies: common_dep,

2
Xext/namespace/meson.build
View File

@ -1,5 +1,5 @@
libxserver_namespace = static_library(
'libxserver_namespace',
'xserver_namespace',
[
'config.c',
'hook-client.c',

4
Xi/meson.build
View File

@ -53,14 +53,14 @@ srcs_xi = [
'xiwarppointer.c',
]
libxserver_xi = static_library('libxserver_xi',
libxserver_xi = static_library('xserver_xi',
srcs_xi,
include_directories: inc,
dependencies: common_dep,
)
srcs_xi_stubs = ['stubs.c']
libxserver_xi_stubs = static_library('libxserver_xi_stubs',
libxserver_xi_stubs = static_library('xserver_xi_stubs',
srcs_xi_stubs,
include_directories: inc,
dependencies: common_dep,

2
composite/meson.build
View File

@ -10,7 +10,7 @@ hdrs_composite = [
'compositeext.h',
]
libxserver_composite = static_library('libxserver_composite',
libxserver_composite = static_library('xserver_composite',
srcs_composite,
include_directories: inc,
dependencies: common_dep,

2
config/meson.build
View File

@ -28,7 +28,7 @@ if build_xorg
install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
endif
libxserver_config = static_library('libxserver_config',
libxserver_config = static_library('xserver_config',
srcs_config,
include_directories: inc,
dependencies: config_dep,

2
damageext/meson.build
View File

@ -2,7 +2,7 @@ srcs_damageext = [
'damageext.c',
]
libxserver_damageext = static_library('libxserver_damageext',
libxserver_damageext = static_library('xserver_damageext',
srcs_damageext,
include_directories: inc,
dependencies: common_dep,

2
dbe/meson.build
View File

@ -3,7 +3,7 @@ srcs_dbe = [
'midbe.c',
]
libxserver_dbe = static_library('libxserver_dbe',
libxserver_dbe = static_library('xserver_dbe',
srcs_dbe,
include_directories: inc,
dependencies: common_dep,

4
dix/meson.build
View File

@ -57,13 +57,13 @@ endif
dtrace_dep = declare_dependency(sources: [dtrace_src, dtrace_hdr])
libxserver_dix = static_library('libxserver_dix',
libxserver_dix = static_library('xserver_dix',
[ srcs_dix, builtinatoms_src ],
include_directories: inc,
dependencies: [ dtrace_dep, common_dep, ]
)
libxserver_main = static_library('libxserver_main',
libxserver_main = static_library('xserver_main',
'stubmain.c',
include_directories: inc,
dependencies: common_dep,

2
dri3/meson.build
View File

@ -10,7 +10,7 @@ hdrs_dri3 = [
libxserver_dri3 = []
if build_dri3
libxserver_dri3 = static_library('libxserver_dri3',
libxserver_dri3 = static_library('xserver_dri3',
srcs_dri3,
include_directories: inc,
dependencies: [ common_dep, libdrm_dep ],

2
exa/meson.build
View File

@ -12,7 +12,7 @@ srcs_exa = [
'exa_unaccel.c',
]
libxserver_exa = static_library('libxserver_exa',
libxserver_exa = static_library('xserver_exa',
srcs_exa,
include_directories: inc,
dependencies: common_dep,

4
fb/meson.build
View File

@ -37,7 +37,7 @@ hdrs_fb = [
'wfbrename.h'
]
libxserver_fb = static_library('libxserver_fb',
libxserver_fb = static_library('xserver_fb',
srcs_fb,
include_directories: inc,
dependencies: common_dep,
@ -46,7 +46,7 @@ libxserver_fb = static_library('libxserver_fb',
wfb_args = '-DFB_ACCESS_WRAPPER'
libxserver_wfb = static_library('libxserver_wfb',
libxserver_wfb = static_library('xserver_wfb',
srcs_fb,
c_args: wfb_args,
include_directories: inc,

22
glx/indirect_util.c
View File

@ -128,13 +128,10 @@ __glXSendReply(ClientPtr client, const void *data, size_t elements,
.retval = retval,
};
/* It is faster on almost always every architecture to just copy the 8
* bytes, even when not necessary, than check to see of the value of
* elements requires it. Copying the data when not needed will do no
* harm.
*/
(void) memcpy(&reply.pad3, data, 8);
/* Single element goes in reply padding; don't leak uninitialized data. */
if (elements == 1) {
(void) memcpy(&reply.pad3, data, element_size);
}
WriteToClient(client, sizeof(xGLXSingleReply), &reply);
if (reply_ints != 0) {
@ -176,13 +173,10 @@ __glXSendReplySwap(ClientPtr client, const void *data, size_t elements,
.retval = bswap_32(retval),
};
/* It is faster on almost always every architecture to just copy the 8
* bytes, even when not necessary, than check to see of the value of
* elements requires it. Copying the data when not needed will do no
* harm.
*/
(void) memcpy(&reply.pad3, data, 8);
/* Single element goes in reply padding; don't leak uninitialized data. */
if (elements == 1) {
(void) memcpy(&reply.pad3, data, element_size);
}
WriteToClient(client, sizeof(xGLXSingleReply), &reply);
if (reply_ints != 0) {

4
glx/meson.build
View File

@ -32,7 +32,7 @@ srcs_glx = [
libxserver_glx = []
if build_glx
libxserver_glx = static_library('libxserver_glx',
libxserver_glx = static_library('xserver_glx',
srcs_glx,
include_directories: inc,
dependencies: [
@ -68,7 +68,7 @@ hdrs_vnd = [
libglxvnd = []
if build_glx
libglxvnd = static_library('libglxvnd',
libglxvnd = static_library('glxvnd',
srcs_vnd,
include_directories: inc,
dependencies: [

4
glx/singlesize.c
View File

@ -105,7 +105,7 @@ __glGetMap_size(GLenum target, GLenum query)
}
break;
}
return -1;
return 0;
}
GLint
@ -164,7 +164,7 @@ __glGetPixelMap_size(GLenum map)
query = GL_PIXEL_MAP_A_TO_A_SIZE;
break;
default:
return -1;
return 0;
}
glGetIntegerv(query, &size);
return size;

7
hw/xfree86/compat/log.c
View File

@ -39,7 +39,12 @@ _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...)
void
xf86MsgVerb(MessageType type, int verb, const char *format, ...)
{
xf86NVidiaBugInternalFunc("xf86MsgVerb()");
static char reportxf86MsgVerb = 1;
if (reportxf86MsgVerb) {
xf86NVidiaBugInternalFunc("xf86MsgVerb()");
reportxf86MsgVerb = 0;
}
va_list ap;
va_start(ap, format);

4
meson.build
View File

@ -3,10 +3,10 @@ project('xserver', 'c',
'buildtype=debugoptimized',
'c_std=gnu99',
],
version: '25.0.0.2',
version: '25.0.0.3',
meson_version: '>= 0.58.0',
)
release_date = '2025-06-30'
release_date = '2025-07-02'
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
cc = meson.get_compiler('c')

2
mi/meson.build
View File

@ -40,7 +40,7 @@ hdrs_mi = [
'mizerarc.h',
]
libxserver_mi = static_library('libxserver_mi',
libxserver_mi = static_library('xserver_mi',
srcs_mi,
include_directories: inc,
dependencies: [

4
mi/mipointer.c
View File

@ -141,7 +141,7 @@ miPointerInitialize(ScreenPtr pScreen,
pScreenPriv->screenFuncs = screenFuncs;
pScreenPriv->waitForUpdate = waitForUpdate;
pScreenPriv->showTransparent = FALSE;
dixScreenHookClose(pScreen, miPointerCloseScreen);
dixScreenHookPostClose(pScreen, miPointerCloseScreen);
dixSetPrivate(&pScreen->devPrivates, miPointerScreenKey, pScreenPriv);
/*
* set up screen cursor method table
@ -169,7 +169,7 @@ static void miPointerCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void
{
SetupScreen(pScreen);
dixScreenUnhookClose(pScreen, miPointerCloseScreen);
dixScreenUnhookPostClose(pScreen, miPointerCloseScreen);
free((void *) pScreenPriv);
dixSetPrivate(&pScreen->devPrivates, miPointerScreenKey, NULL);
FreeEventList(mipointermove_events, GetMaximumEventsNum());

2
miext/damage/meson.build
View File

@ -7,7 +7,7 @@ hdrs_miext_damage = [
'damagestr.h',
]
libxserver_miext_damage = static_library('libxserver_miext_damage',
libxserver_miext_damage = static_library('xserver_miext_damage',
srcs_miext_damage,
include_directories: inc,
dependencies: common_dep,

2
miext/rootless/meson.build
View File

@ -6,7 +6,7 @@ srcs_miext_rootless = [
'rootlessWindow.c',
]
libxserver_miext_rootless = static_library('libxserver_miext_rootless',
libxserver_miext_rootless = static_library('xserver_miext_rootless',
srcs_miext_rootless,
include_directories: inc,
dependencies: common_dep,

2
miext/shadow/meson.build
View File

@ -29,7 +29,7 @@ hdrs_miext_shadow = [
'shadow.h',
]
libxserver_miext_shadow = static_library('libxserver_miext_shadow',
libxserver_miext_shadow = static_library('xserver_miext_shadow',
srcs_miext_shadow,
include_directories: inc,
dependencies: common_dep,

2
miext/sync/meson.build
View File

@ -14,7 +14,7 @@ if build_dri3
srcs_miext_sync += 'misyncshm.c'
endif
libxserver_miext_sync = static_library('libxserver_miext_sync',
libxserver_miext_sync = static_library('xserver_miext_sync',
srcs_miext_sync,
include_directories: inc,
dependencies: [

4
os/meson.build
View File

@ -79,7 +79,7 @@ endif
libxlibc = []
if srcs_libc.length() > 0
libxlibc = static_library('libxlibc',
libxlibc = static_library('xlibc',
srcs_libc,
include_directories: inc,
dependencies: [
@ -92,7 +92,7 @@ if enable_input_thread
os_dep += cc.find_library('pthread')
endif
libxserver_os = static_library('libxserver_os',
libxserver_os = static_library('xserver_os',
srcs_os,
include_directories: inc,
dependencies: [

2
present/meson.build
View File

@ -15,7 +15,7 @@ hdrs_present = [
'present.h',
]
libxserver_present = static_library('libxserver_present',
libxserver_present = static_library('xserver_present',
srcs_present,
include_directories: inc,
dependencies: [

2
pseudoramiX/meson.build
View File

@ -1,4 +1,4 @@
libxserver_pseudoramix = static_library('libxserver_pseudoramiX',
libxserver_pseudoramix = static_library('xserver_pseudoramiX',
'pseudoramiX.c',
include_directories: inc,
dependencies: common_dep,

2
randr/meson.build
View File

@ -25,7 +25,7 @@ if build_xinerama
srcs_randr += 'rrxinerama.c'
endif
libxserver_randr = static_library('libxserver_randr',
libxserver_randr = static_library('xserver_randr',
srcs_randr,
include_directories: inc,
dependencies: common_dep,

2
record/meson.build
View File

@ -3,7 +3,7 @@ srcs_record = [
'set.c',
]
libxserver_record = static_library('libxserver_record',
libxserver_record = static_library('xserver_record',
srcs_record,
include_directories: inc,
dependencies: common_dep,

2
render/meson.build
View File

@ -19,7 +19,7 @@ hdrs_render = [
'picturestr.h',
]
libxserver_render = static_library('libxserver_render',
libxserver_render = static_library('xserver_render',
srcs_render,
include_directories: inc,
dependencies: common_dep,

2
xfixes/meson.build
View File

@ -7,7 +7,7 @@ srcs_xfixes = [
'xfixes.c',
]
libxserver_xfixes = static_library('libxserver_xfixes',
libxserver_xfixes = static_library('xserver_xfixes',
srcs_xfixes,
include_directories: inc,
dependencies: common_dep,

4
xkb/meson.build
View File

@ -23,7 +23,7 @@ srcs_xkb = [
'XKBMAlloc.c',
]
libxserver_xkb = static_library('libxserver_xkb',
libxserver_xkb = static_library('xserver_xkb',
srcs_xkb,
include_directories: inc,
dependencies: common_dep,
@ -35,7 +35,7 @@ srcs_xkb_stubs = [
'ddxVT.c',
]
libxserver_xkb_stubs = static_library('libxserver_xkb_stubs',
libxserver_xkb_stubs = static_library('xserver_xkb_stubs',
srcs_xkb_stubs,
include_directories: inc,
dependencies: common_dep,