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

Merge branch 'master' into patch-10

This commit is contained in:
Collin 2025-06-30 16:09:38 -05:00 committed by GitHub
parent a692784259 6a3162d623
commit 6dfdb7ea84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/ISSUE_TEMPLATE/01-bug-report.yml vendored
View File

@ -14,8 +14,7 @@ body:
attributes: attributes:
label: Select the version label: Select the version
options: options:
- 25.0.0.0 - 25.0.0.X
- 25.0.0.1
- Git master branch - Git master branch
- other or don't know - other or don't know
default: 1 default: 1

1
.github/scripts/compile-drivers.sh vendored
View File

@ -14,6 +14,7 @@ cd $DRV_BUILD_DIR
build_drv_ac xf86-input-elographics $X11L_DRV_GIT/xf86-input-elographics master build_drv_ac xf86-input-elographics $X11L_DRV_GIT/xf86-input-elographics master
build_drv_ac xf86-input-evdev $X11L_DRV_GIT/xf86-input-evdev master build_drv_ac xf86-input-evdev $X11L_DRV_GIT/xf86-input-evdev master
build_drv_ac xf86-input-libinput $X11L_DRV_GIT/xf86-input-libinput master build_drv_ac xf86-input-libinput $X11L_DRV_GIT/xf86-input-libinput master
build_drv_ac xf86-input-mouse $X11L_DRV_GIT/xf86-input-mouse master
build_drv_ac xf86-input-synaptics $X11L_DRV_GIT/xf86-input-synaptics master build_drv_ac xf86-input-synaptics $X11L_DRV_GIT/xf86-input-synaptics master
build_drv_ac xf86-video-amdgpu $X11L_DRV_GIT/xf86-video-amdgpu xf86-video-amdgpu-23.0.0 build_drv_ac xf86-video-amdgpu $X11L_DRV_GIT/xf86-video-amdgpu xf86-video-amdgpu-23.0.0

3
.github/workflows/build-xserver.yml vendored
View File

@ -1,5 +1,8 @@
name: Build X servers name: Build X servers
permissions:
contents: read
env: env:
MESON_BUILDDIR: "build" MESON_BUILDDIR: "build"
X11_PREFIX: /home/runner/x11 X11_PREFIX: /home/runner/x11

9
hw/xnest/Screen.c
View File

@ -163,10 +163,11 @@ static void add_depth_visual(DepthPtr depths, int *numDepths, int nplanes, Visua
Bool Bool
xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[]) xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
{ {
unsigned long valuemask;
VisualID defaultVisual = 0; unsigned long valuemask;
int rootDepth = 0; VisualID defaultVisual = 0;
miPointerScreenPtr PointPriv; int rootDepth = 0;
miPointerScreenPtr PointPriv;
if (!dixRegisterPrivateKey if (!dixRegisterPrivateKey
(&xnestWindowPrivateKeyRec, PRIVATE_WINDOW, sizeof(xnestPrivWin))) (&xnestWindowPrivateKeyRec, PRIVATE_WINDOW, sizeof(xnestPrivWin)))

4
meson.build
View File

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