chore: update to 0.17.4

sync upstream Log:
deepin-community · Oct 17, 2024 · a2f7f0c · a2f7f0c
1 parent 00e7d15
commit a2f7f0c
Show file tree

Hide file tree

Showing 40 changed files with 343 additions and 245 deletions.
diff --git a/backend/drm/libliftoff.c b/backend/drm/libliftoff.c
@@ -7,6 +7,7 @@
 
 #include "backend/drm/drm.h"
 #include "backend/drm/iface.h"
+#include "config.h"
 
 static bool init(struct wlr_drm_backend *drm) {
 	// TODO: lower log level
@@ -436,7 +437,11 @@ static bool crtc_commit(struct wlr_drm_connector *conn,
 		goto out;
 	}
 
+#if HAVE_LIBLIFTOFF_0_5
+	int ret = liftoff_output_apply(crtc->liftoff, req, flags, NULL);
+#else
 	int ret = liftoff_output_apply(crtc->liftoff, req, flags);
+#endif
 	if (ret != 0) {
 		wlr_drm_conn_log(conn, test_only ? WLR_DEBUG : WLR_ERROR,
 			"liftoff_output_apply failed: %s", strerror(-ret));

diff --git a/backend/drm/meson.build b/backend/drm/meson.build
@@ -47,6 +47,7 @@ wlr_files += files(
 
 if libliftoff.found()
 	wlr_files += files('libliftoff.c')
+	internal_config.set10('HAVE_LIBLIFTOFF_0_5', libliftoff.version().version_compare('>=0.5.0'))
 endif
 
 features += { 'drm-backend': true }

diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
@@ -106,13 +106,11 @@ static bool backend_start(struct wlr_backend *wlr_backend) {
 
 	int libinput_fd = libinput_get_fd(backend->libinput_context);
 
+	handle_libinput_readable(libinput_fd, WL_EVENT_READABLE, backend);
 	if (!env_parse_bool("WLR_LIBINPUT_NO_DEVICES") && wl_list_empty(&backend->devices)) {
-		handle_libinput_readable(libinput_fd, WL_EVENT_READABLE, backend);
-		if (wl_list_empty(&backend->devices)) {
-			wlr_log(WLR_ERROR, "libinput initialization failed, no input devices");
-			wlr_log(WLR_ERROR, "Set WLR_LIBINPUT_NO_DEVICES=1 to suppress this check");
-			return false;
-		}
+		wlr_log(WLR_ERROR, "libinput initialization failed, no input devices");
+		wlr_log(WLR_ERROR, "Set WLR_LIBINPUT_NO_DEVICES=1 to suppress this check");
+		return false;
 	}
 
 	struct wl_event_loop *event_loop =

diff --git a/backend/wayland/tablet_v2.c b/backend/wayland/tablet_v2.c
@@ -405,6 +405,7 @@ static void handle_pad_added(void *data,
 	struct wlr_wl_seat *seat = data;
 	if (seat->zwp_tablet_pad_v2 != NULL) {
 		wlr_log(WLR_ERROR, "zwp_tablet_pad_v2 is already present");
+		zwp_tablet_pad_v2_destroy(zwp_tablet_pad_v2);
 		return;
 	}
 
@@ -780,6 +781,7 @@ static void handle_tool_added(void *data,
 	struct wlr_wl_seat *seat = data;
 	if (seat->zwp_tablet_tool_v2 != NULL) {
 		wlr_log(WLR_ERROR, "zwp_tablet_tool_v2 already present");
+		zwp_tablet_tool_v2_destroy(zwp_tablet_tool_v2);
 		return;
 	}
 
@@ -861,6 +863,7 @@ static void handle_tab_added(void *data,
 	struct wlr_wl_seat *seat = data;
 	if (seat->zwp_tablet_v2 != NULL) {
 		wlr_log(WLR_ERROR, "zwp_tablet_v2 already present");
+		zwp_tablet_v2_destroy(zwp_tablet_v2);
 		return;
 	}
 

diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
@@ -129,7 +129,7 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,
 		}
 
 		wlr_keyboard_notify_modifiers(&x11->keyboard, ev->mods.base,
-			ev->mods.latched, ev->mods.locked, ev->mods.effective);
+			ev->mods.latched, ev->mods.locked, ev->group.effective);
 		send_key_event(x11, ev->detail - 8, WL_KEYBOARD_KEY_STATE_PRESSED, ev->time);
 		x11->time = ev->time;
 		break;
@@ -139,7 +139,7 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,
 			(xcb_input_key_release_event_t *)event;
 
 		wlr_keyboard_notify_modifiers(&x11->keyboard, ev->mods.base,
-			ev->mods.latched, ev->mods.locked, ev->mods.effective);
+			ev->mods.latched, ev->mods.locked, ev->group.effective);
 		send_key_event(x11, ev->detail - 8, WL_KEYBOARD_KEY_STATE_RELEASED, ev->time);
 		x11->time = ev->time;
 		break;

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+wlroots (0.17.4-1) unstable; urgency=medium
+
+  * Sync upstream
+
+ -- Dingyuan Zhang <[email protected]>  Thu, 17 Oct 2024 11:32:00 +0800
+
 wlroots (0.17.2-1deepin2) unstable; urgency=medium
 
   * Add deepin patchs

diff --git a/debian/patches/Revert-layer-shell-error-on-0-dimension-without-anchors.patch b/debian/patches/Revert-layer-shell-error-on-0-dimension-without-anchors.patch
@@ -10,18 +10,18 @@ Revert this until phosh has a fixed release.
  1 file changed, 2 insertions(+)
 
 diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
-index 37256db..2c722a7 100644
+index fd19a67..eed3567 100644
 --- a/types/wlr_layer_shell_v1.c
 +++ b/types/wlr_layer_shell_v1.c
-@@ -335,6 +335,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
+@@ -341,6 +341,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
  		return;
  	}
 
 +#if 0
  	const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
  		ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
  	if (surface->pending.desired_width == 0 &&
-@@ -354,6 +355,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
+@@ -360,6 +361,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
  			"height 0 requested without setting top and bottom anchors");
  		return;
  	}

diff --git a/debian/patches/emit-destroy-signal-in-destroy-function.patch b/debian/patches/emit-destroy-signal-in-destroy-function.patch
diff --git a/debian/patches/gles2-Avoid-crash-when-glGetInteger64vEXT-is-missing.patch b/debian/patches/gles2-Avoid-crash-when-glGetInteger64vEXT-is-missing.patch
diff --git a/debian/patches/init-destroy-signal.patch b/debian/patches/init-destroy-signal.patch
diff --git a/debian/patches/reset_hardware_cursor_on_failure.patch b/debian/patches/reset_hardware_cursor_on_failure.patch
diff --git a/debian/patches/series b/debian/patches/series
@@ -1,5 +1 @@
 Revert-layer-shell-error-on-0-dimension-without-anchors.patch
-gles2-Avoid-crash-when-glGetInteger64vEXT-is-missing.patch
-emit-destroy-signal-in-destroy-function.patch
-init-destroy-signal.patch
-reset_hardware_cursor_on_failure.patch
diff --git a/debian/watch b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-opts="filenamemangle=s/.*\/archive\/(\d\S+)\/wlroots.*\.tar\.gz/wlroots-$1\.tar\.gz/g, uversionmangle=s/_(alpha|beta|rc)/~$1/" \
-  https://gitlab.freedesktop.org/wlroots/wlroots/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.*
+opts="searchmode=plain" \
+ https://gitlab.freedesktop.org/wlroots//@PACKAGE@/tags?sort=updated_desc -/archive/v?\d[\d.]+/@PACKAGE@-@ANY_VERSION@.tar.gz debian uupdate
diff --git a/include/types/wlr_xdg_shell.h b/include/types/wlr_xdg_shell.h
@@ -36,4 +36,9 @@ struct wlr_xdg_toplevel_configure *send_xdg_toplevel_configure(
 void handle_xdg_toplevel_ack_configure(struct wlr_xdg_toplevel *toplevel,
 	struct wlr_xdg_toplevel_configure *configure);
 
+/**
+ * Returns true if a positioner is complete.
+ */
+bool wlr_xdg_positioner_is_complete(struct wlr_xdg_positioner *positioner);
+
 #endif
diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h
@@ -288,8 +288,9 @@ bool wlr_surface_has_buffer(struct wlr_surface *surface);
 struct wlr_texture *wlr_surface_get_texture(struct wlr_surface *surface);
 
 /**
- * Get the root of the subsurface tree for this surface. Can return NULL if
- * a surface in the tree has been destroyed.
+ * Get the root of the subsurface tree for this surface.
+ * May return the same surface passed if that surface is the root.
+ * Never returns NULL.
  */
 struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface);
 

diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h
@@ -161,4 +161,8 @@ char *xwm_get_atom_name(struct wlr_xwm *xwm, xcb_atom_t atom);
 bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
 	size_t num_atoms, enum atom_name needle);
 
+xcb_void_cookie_t xwm_send_event_with_size(xcb_connection_t *c,
+	uint8_t propagate, xcb_window_t destination,
+	uint32_t event_mask, const void *event, uint32_t length);
+
 #endif
diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
 	'wlroots',
 	'c',
-	version: '0.17.2',
+	version: '0.17.4',
 	license: 'MIT',
 	meson_version: '>=0.59.0',
 	default_options: [

diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
@@ -915,7 +915,11 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
 		load_gl_proc(&renderer->procs.glQueryCounterEXT, "glQueryCounterEXT");
 		load_gl_proc(&renderer->procs.glGetQueryObjectivEXT, "glGetQueryObjectivEXT");
 		load_gl_proc(&renderer->procs.glGetQueryObjectui64vEXT, "glGetQueryObjectui64vEXT");
-		load_gl_proc(&renderer->procs.glGetInteger64vEXT, "glGetInteger64vEXT");
+		if (eglGetProcAddress("glGetInteger64vEXT")) {
+			load_gl_proc(&renderer->procs.glGetInteger64vEXT, "glGetInteger64vEXT");
+		} else {
+			load_gl_proc(&renderer->procs.glGetInteger64vEXT, "glGetInteger64v");
+		}
 	}
 
 	if (renderer->exts.KHR_debug) {