dix/events.c

@@ -1215,7 +1215,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
     qe->pScreen = pSprite->hotPhys.pScreen;
     qe->months = currentTime.months;
     qe->event = (InternalEvent *) (qe + 1);
-    memcpy(qe->event, event, eventlen);
+    CopyPartialInternalEvent(qe->event, (InternalEvent *)event);
     xorg_list_append(&qe->next, &syncEvents.pending);
 }
 

hw/kdrive/src/kdrive.c

@@ -352,7 +352,7 @@ KdUseMsg(void)
     ErrorF
         ("-rgba rgb/bgr/vrgb/vbgr/none   Specify subpixel ordering for LCD panels\n");
     ErrorF
-        ("-mouse driver [,n,,options]    Specify the pointer driver and its options (n is the number of buttons)\n");
+        ("-mouse driver [,n,options]    Specify the pointer driver and its options (n is the number of buttons)\n");
     ErrorF
         ("-keybd driver [,,options]      Specify the keyboard driver and its options\n");
     ErrorF("-xkb-rules       Set default XkbRules value (can be overridden by -keybd options)\n");

meson.build

@@ -205,36 +205,35 @@ libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], requir
 
 build_xwayland = false
 if (host_machine.system() != 'darwin' and
-    host_machine.system() != 'windows')
-    if get_option('xwayland') != 'false'
-        xwayland_required = get_option('xwayland') == 'true'
-        build_glamor = glamor_option == 'true' or glamor_option == 'auto'
-
-        xwayland_path = get_option('xwayland-path')
-        if (xwayland_path == '')
-            xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
-        endif
-
-        wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
-        xwayland_dep = [
-            wayland_client_dep,
-            dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
-            dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
-        ]
+    host_machine.system() != 'windows' and
+    get_option('xwayland') != 'false')
+    xwayland_required = get_option('xwayland') == 'true'
+    build_glamor = glamor_option == 'true' or glamor_option == 'auto'
+
+    xwayland_path = get_option('xwayland-path')
+    if (xwayland_path == '')
+        xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
+    endif
 
-        if build_glamor
-            xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required)
-            xwayland_dep += dependency('epoxy', required: xwayland_required)
-        endif
+    wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
+    xwayland_dep = [
+        wayland_client_dep,
+        dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
+        dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
+    ]
 
-        build_xwayland = true
-        # check for all the deps being found, to handle 'auto' mode.
-        foreach d: xwayland_dep
-            if not d.found()
-                build_xwayland = false
-            endif
-        endforeach
+    if build_glamor
+        xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required)
+        xwayland_dep += dependency('epoxy', required: xwayland_required)
     endif
+
+    build_xwayland = true
+    # check for all the deps being found, to handle 'auto' mode.
+    foreach d: xwayland_dep
+        if not d.found()
+            build_xwayland = false
+        endif
+    endforeach
 else
     wayland_client_dep = dependency('', required: false)
 endif