* [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/files/
@ 2020-04-19 15:22 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2020-04-19 15:22 UTC (permalink / raw
To: gentoo-commits
commit: d28bb06401f102e02cc7f4f921651e4c7dea2d77
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Mar 22 18:52:21 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 15:22:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28bb064
gui-libs/wlroots: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15061
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/wlroots-0.8.1-eglmesaextfix.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
deleted file mode 100644
index 614d0c7a2cd..00000000000
--- a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d113e48a2a32542fe6e12f1759f07888364609bf Mon Sep 17 00:00:00 2001
-From: Ferdinand Bachmann <theferdi265@gmail.com>
-Date: Sat, 19 Oct 2019 13:33:22 +0200
-Subject: [PATCH] Add missing include required by mesa and libglvnd change
-
-eglext.h no longer inludes eglmesaext.h, include it within wlroots
-explicitly.
-
-Fixes #1862
----
- glgen.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/glgen.sh b/glgen.sh
-index 7324fdf6b..31af28120 100755
---- a/glgen.sh
-+++ b/glgen.sh
-@@ -75,6 +75,7 @@ cat > "$OUTDIR/$BASE.h" << EOF
-
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/files/
@ 2020-04-19 15:51 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2020-04-19 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 5903aafb49b3850b3a6715287b511bc19669526d
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 15:50:12 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 15:50:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5903aafb
gui-libs/wlroots: rename patch for version bump
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../wlroots/files/{wlroots-0.10.0-gcc-10.patch => wlroots-gcc-10.patch} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/gui-libs/wlroots/files/wlroots-0.10.0-gcc-10.patch b/gui-libs/wlroots/files/wlroots-gcc-10.patch
similarity index 100%
rename from gui-libs/wlroots/files/wlroots-0.10.0-gcc-10.patch
rename to gui-libs/wlroots/files/wlroots-gcc-10.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/files/
@ 2020-11-20 13:26 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2020-11-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: f8eb05c5164636ff5ce070c0849efaaf8fb33170
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 08:01:34 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 13:25:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8eb05c5
gui-libs/wlroots: remove unused patch(es)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18279
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
gui-libs/wlroots/files/wlroots-gcc-10.patch | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/gui-libs/wlroots/files/wlroots-gcc-10.patch b/gui-libs/wlroots/files/wlroots-gcc-10.patch
deleted file mode 100644
index 44e1cb7d89b..00000000000
--- a/gui-libs/wlroots/files/wlroots-gcc-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/707496
-
-From f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
-Date: Tue, 28 Jan 2020 15:27:24 +0100
-Subject: [PATCH] Declare wlr_seat globals as extern
-
----
- include/types/wlr_seat.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/include/types/wlr_seat.h
-+++ b/include/types/wlr_seat.h
-@@ -4,9 +4,9 @@
- #include <wayland-server-core.h>
- #include <wlr/types/wlr_seat.h>
-
--const struct wlr_pointer_grab_interface default_pointer_grab_impl;
--const struct wlr_keyboard_grab_interface default_keyboard_grab_impl;
--const struct wlr_touch_grab_interface default_touch_grab_impl;
-+extern const struct wlr_pointer_grab_interface default_pointer_grab_impl;
-+extern const struct wlr_keyboard_grab_interface default_keyboard_grab_impl;
-+extern const struct wlr_touch_grab_interface default_touch_grab_impl;
-
- void seat_client_create_pointer(struct wlr_seat_client *seat_client,
- uint32_t version, uint32_t id);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/files/
@ 2022-10-04 3:50 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-10-04 3:50 UTC (permalink / raw
To: gentoo-commits
commit: 627c1e28477e081fa78c3d675daa0f17f2c247cb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 4 03:50:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 4 03:50:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627c1e28
gui-libs/wlroots: restore patch for 0.15.1
Closes: https://bugs.gentoo.org/874792
Fixes: d8562c999a5aaa91503c780e47c75e14bbaaf1b4
Signed-off-by: Sam James <sam <AT> gentoo.org>
...1-tinywl-dont-crash-upon-missing-keyboard.patch | 55 ++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch b/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
new file mode 100644
index 000000000000..cff1f72ca5ca
--- /dev/null
+++ b/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
@@ -0,0 +1,55 @@
+From 7d950f3dac6cca62635d5e4ff2af33b35372f6db Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Sat, 19 Mar 2022 14:00:43 +0100
+Subject: [PATCH] tinywl: don't crash when there is no keyboard
+
+Running with WLR_BACKENDS=headless, there is no keyboard device.
+Avoid crashes like so:
+
+ ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
+ ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
+ AddressSanitizer:DEADLYSIGNAL
+ =================================================================
+ ==331107==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000120 (pc 0x556ed03e4e99 bp 0x7ffce834bc10 sp 0x7ffce834bbb0 T0)
+ ==331107==The signal is caused by a READ memory access.
+ ==331107==Hint: address points to the zero page.
+ #0 0x556ed03e4e99 in focus_view ../tinywl/tinywl.c:136
+ #1 0x556ed03eb3be in xdg_toplevel_map ../tinywl/tinywl.c:603
+ #2 0x7f75d6f768db in wlr_signal_emit_safe ../util/signal.c:29
+ #3 0x7f75d6e9cac7 in xdg_surface_role_commit ../types/xdg_shell/wlr_xdg_surface.c:315
+ #4 0x7f75d6eb6944 in surface_commit_state ../types/wlr_compositor.c:466
+ #5 0x7f75d6eb7b02 in surface_handle_commit ../types/wlr_compositor.c:523
+ #6 0x7f75d5714d49 (/usr/lib/libffi.so.8+0x6d49)
+ #7 0x7f75d5714266 (/usr/lib/libffi.so.8+0x6266)
+ #8 0x7f75d68cb322 (/usr/lib/libwayland-server.so.0+0xd322)
+ #9 0x7f75d68c65cb (/usr/lib/libwayland-server.so.0+0x85cb)
+ #10 0x7f75d68c91c9 in wl_event_loop_dispatch (/usr/lib/libwayland-server.so.0+0xb1c9)
+ #11 0x7f75d68c6d36 in wl_display_run (/usr/lib/libwayland-server.so.0+0x8d36)
+ #12 0x556ed03eef55 in main ../tinywl/tinywl.c:905
+ #13 0x7f75d5d2330f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f)
+ #14 0x7f75d5d233c0 in __libc_start_main@GLIBC_2.2.5 (/usr/lib/libc.so.6+0x2d3c0)
+ #15 0x556ed03e46e4 in _start (/home/simon/src/wlroots/build/tinywl/tinywl+0x136e4)
+---
+ tinywl/tinywl.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
+index dd442aac..8796e9df 100644
+--- a/tinywl/tinywl.c
++++ b/tinywl/tinywl.c
+@@ -130,8 +130,10 @@ static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) {
+ * track of this and automatically send key events to the appropriate
+ * clients without additional work on your part.
+ */
+- wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
+- keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
++ if (keyboard != NULL) {
++ wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
++ keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
++ }
+ }
+
+ static void keyboard_handle_modifiers(
+--
+2.36.1
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/files/
@ 2022-10-19 21:04 Matthew Thode
0 siblings, 0 replies; 6+ messages in thread
From: Matthew Thode @ 2022-10-19 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 695b324ce3428312ef49b6962e2776bc9112f89b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Oct 19 17:04:08 2022 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 21:04:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=695b324c
gui-libs/wlroots: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
gui-libs/wlroots/files/0.15.0-59b9518f.patch | 88 ----------------------------
1 file changed, 88 deletions(-)
diff --git a/gui-libs/wlroots/files/0.15.0-59b9518f.patch b/gui-libs/wlroots/files/0.15.0-59b9518f.patch
deleted file mode 100644
index 95ca0becd618..000000000000
--- a/gui-libs/wlroots/files/0.15.0-59b9518f.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 59b9518f072527ac59593e51df7f5d5331a34f0e Mon Sep 17 00:00:00 2001
-From: Thomas Hebb <tommyhebb@gmail.com>
-Date: Wed, 5 Jan 2022 00:16:59 -0800
-Subject: [PATCH] render/gles2: don't constrain shm formats to ones that
- support reading
-
-commit 44e8451cd93e ("render/gles2: hide shm formats without GL
-support") added the is_gles2_pixel_format_supported() function to
-render/gles2/pixel_format.c, whose stated purpose is to "check whether
-the renderer has the needed GL extensions to read a given pixel format."
-It then used that function to filter the pixel formats returned by
-get_gles2_shm_formats().
-
-The result of this change is that RGB formats are no longer reported for
-GL drivers that don't implement EXT_read_format_bgra, even when those
-formats are supported for rendering (which they have to be for
-wlr_gles2_renderer_create() to succeed). This is a pretty clear
-regression, since wlr_renderer_init_wl_shm() fails when either of
-WL_SHM_FORMAT_ARGB8888 or WL_SHM_FORMAT_XRGB8888 are missing.
-
-To fix the regression, change is_gles2_pixel_format_supported() to
-accept all pixel formats that support rendering, regardless of whether
-we can read them or not, and move the check for EXT_read_format_bgra
-back into gles2_read_pixels(). (There's already a check for this
-extension in gles2_preferred_read_format(), so we're not breaking any
-abstraction that wasn't already broken.)
-
-Tested on the NVIDIA 495.46 proprietary driver, which doesn't support
-EXT_read_format_bgra.
-
-Fixes: 44e8451cd93e ("render/gles2: hide shm formats without GL support")
----
- render/gles2/pixel_format.c | 14 ++++++++++----
- render/gles2/renderer.c | 6 ++++++
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/render/gles2/pixel_format.c b/render/gles2/pixel_format.c
-index 31bb3908..b155bbbe 100644
---- a/render/gles2/pixel_format.c
-+++ b/render/gles2/pixel_format.c
-@@ -98,6 +98,10 @@ static const struct wlr_gles2_pixel_format formats[] = {
-
- // TODO: more pixel formats
-
-+/*
-+ * Return true if supported for texturing, even if other operations like
-+ * reading aren't supported.
-+ */
- bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
- const struct wlr_gles2_pixel_format *format) {
- if (format->gl_type == GL_UNSIGNED_INT_2_10_10_10_REV_EXT
-@@ -108,10 +112,12 @@ bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
- && !renderer->exts.OES_texture_half_float_linear) {
- return false;
- }
-- if (format->gl_format == GL_BGRA_EXT
-- && !renderer->exts.EXT_read_format_bgra) {
-- return false;
-- }
-+ /*
-+ * Note that we don't need to check for GL_EXT_texture_format_BGRA8888
-+ * here, since we've already checked if we have it at renderer creation
-+ * time and bailed out if not. We do the check there because Wayland
-+ * requires all compositors to support SHM buffers in that format.
-+ */
- return true;
- }
-
-diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
-index 527d85bf..67b8ead4 100644
---- a/render/gles2/renderer.c
-+++ b/render/gles2/renderer.c
-@@ -441,6 +441,12 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
- return false;
- }
-
-+ if (fmt->gl_format == GL_BGRA_EXT && !renderer->exts.EXT_read_format_bgra) {
-+ wlr_log(WLR_ERROR,
-+ "Cannot read pixels: missing GL_EXT_read_format_bgra extension");
-+ return false;
-+ }
-+
- const struct wlr_pixel_format_info *drm_fmt =
- drm_get_pixel_format_info(fmt->drm_format);
- assert(drm_fmt);
---
-GitLab
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/files/
@ 2024-08-28 7:25 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-08-28 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 128857a916b8909f497bf490eefcc3fbc08d236f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 28 07:14:25 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 07:25:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128857a9
gui-libs/wlroots: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...1-tinywl-dont-crash-upon-missing-keyboard.patch | 55 ----------------------
1 file changed, 55 deletions(-)
diff --git a/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch b/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
deleted file mode 100644
index cff1f72ca5ca..000000000000
--- a/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7d950f3dac6cca62635d5e4ff2af33b35372f6db Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 19 Mar 2022 14:00:43 +0100
-Subject: [PATCH] tinywl: don't crash when there is no keyboard
-
-Running with WLR_BACKENDS=headless, there is no keyboard device.
-Avoid crashes like so:
-
- ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
- ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
- AddressSanitizer:DEADLYSIGNAL
- =================================================================
- ==331107==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000120 (pc 0x556ed03e4e99 bp 0x7ffce834bc10 sp 0x7ffce834bbb0 T0)
- ==331107==The signal is caused by a READ memory access.
- ==331107==Hint: address points to the zero page.
- #0 0x556ed03e4e99 in focus_view ../tinywl/tinywl.c:136
- #1 0x556ed03eb3be in xdg_toplevel_map ../tinywl/tinywl.c:603
- #2 0x7f75d6f768db in wlr_signal_emit_safe ../util/signal.c:29
- #3 0x7f75d6e9cac7 in xdg_surface_role_commit ../types/xdg_shell/wlr_xdg_surface.c:315
- #4 0x7f75d6eb6944 in surface_commit_state ../types/wlr_compositor.c:466
- #5 0x7f75d6eb7b02 in surface_handle_commit ../types/wlr_compositor.c:523
- #6 0x7f75d5714d49 (/usr/lib/libffi.so.8+0x6d49)
- #7 0x7f75d5714266 (/usr/lib/libffi.so.8+0x6266)
- #8 0x7f75d68cb322 (/usr/lib/libwayland-server.so.0+0xd322)
- #9 0x7f75d68c65cb (/usr/lib/libwayland-server.so.0+0x85cb)
- #10 0x7f75d68c91c9 in wl_event_loop_dispatch (/usr/lib/libwayland-server.so.0+0xb1c9)
- #11 0x7f75d68c6d36 in wl_display_run (/usr/lib/libwayland-server.so.0+0x8d36)
- #12 0x556ed03eef55 in main ../tinywl/tinywl.c:905
- #13 0x7f75d5d2330f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f)
- #14 0x7f75d5d233c0 in __libc_start_main@GLIBC_2.2.5 (/usr/lib/libc.so.6+0x2d3c0)
- #15 0x556ed03e46e4 in _start (/home/simon/src/wlroots/build/tinywl/tinywl+0x136e4)
----
- tinywl/tinywl.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
-index dd442aac..8796e9df 100644
---- a/tinywl/tinywl.c
-+++ b/tinywl/tinywl.c
-@@ -130,8 +130,10 @@ static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) {
- * track of this and automatically send key events to the appropriate
- * clients without additional work on your part.
- */
-- wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
-- keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+ if (keyboard != NULL) {
-+ wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
-+ keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+ }
- }
-
- static void keyboard_handle_modifiers(
---
-2.36.1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-28 7:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-19 15:51 [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2024-08-28 7:25 Joonas Niilola
2022-10-19 21:04 Matthew Thode
2022-10-04 3:50 Sam James
2020-11-20 13:26 Aaron Bauman
2020-04-19 15:22 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox