[gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/, gui-libs/wlroots/files/

[gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/, gui-libs/wlroots/files/

[Aaron Bauman]

commit:     5cc23f3882c4026d7b1a7d27c9d825bad6cf947b
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 18:35:42 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 18:37:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc23f38

gui-libs/wlroots: add patch to include EGL/eglmesaext.h

* Patch is currently in upstream master. Expect it to hit on next release
(0.8.2+)

Closes: https://bugs.gentoo.org/700114

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/wlroots-0.8.1-eglmesaextfix.patch        | 25 ++++++++++++++++++++++
 gui-libs/wlroots/wlroots-0.8.1-r1.ebuild           |  3 +++
 2 files changed, 28 insertions(+)

diff --git a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
new file mode 100644
index 00000000000..614d0c7a2cd
--- /dev/null
+++ b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch
@@ -0,0 +1,25 @@
+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>
+ 

diff --git a/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
index 50a4262598f..51f138afcfd 100644
--- a/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
@@ -68,6 +68,9 @@ src_configure() {
 		emesonargs+=("-Dlogind=disabled")
 	fi
 
+	# Patch is currently in upstream master
+	eapply "${FILESDIR}/wlroots-0.8.1-eglmesaextfix.patch"
+
 	meson_src_configure
 }
 

[gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/, gui-libs/wlroots/files/

[Matthew Thode]

commit:     d8562c999a5aaa91503c780e47c75e14bbaaf1b4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 01:16:40 2022 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 01:17:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8562c99

gui-libs/wlroots: 9999 remove patch merged upstream and update libdrm dep

Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 ...1-tinywl-dont-crash-upon-missing-keyboard.patch | 55 ----------------------
 gui-libs/wlroots/wlroots-9999.ebuild               |  4 +-
 2 files changed, 1 insertion(+), 58 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
-

diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 75ec633f9e48..15944c4b865a 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 		dev-util/vulkan-headers:0=
 		media-libs/vulkan-loader:0=
 	)
-	>=x11-libs/libdrm-2.4.109:0=
+	>=x11-libs/libdrm-2.4.113:0=
 	x11-libs/libxkbcommon
 	x11-libs/pixman
 	x11-backend? ( x11-libs/libxcb:0= )
@@ -54,8 +54,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch )
-
 src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(

[gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/, gui-libs/wlroots/files/

[Arthur Zamarin]

commit:     21f07887b141ab22aff8aaa32b993883409aa781
Author:     Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Thu Jun  6 17:50:26 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 05:44:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f07887

gui-libs/wlroots: fix automagic of libliftoff

Closes: https://bugs.gentoo.org/933600
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../wlroots-0.17-fix-automagic-libliftoff.patch    | 43 ++++++++++++++++++++++
 ...s-0.17.3-r2.ebuild => wlroots-0.17.3-r3.ebuild} |  6 +++
 gui-libs/wlroots/wlroots-9999.ebuild               |  2 +
 3 files changed, 51 insertions(+)

diff --git a/gui-libs/wlroots/files/wlroots-0.17-fix-automagic-libliftoff.patch b/gui-libs/wlroots/files/wlroots-0.17-fix-automagic-libliftoff.patch
new file mode 100644
index 000000000000..86dd42521e43
--- /dev/null
+++ b/gui-libs/wlroots/files/wlroots-0.17-fix-automagic-libliftoff.patch
@@ -0,0 +1,43 @@
+https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/385c9ade5f7a8ce9e5c13f762d56e6bd1c8d1b0a
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
+ <leohdz172@proton.me>
+Date: Wed, 5 Jun 2024 22:33:05 -0600
+Subject: [PATCH] add an option to enable/disable libliftoff
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+instead of always using it if found
+
+Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
+--- a/backend/drm/meson.build
++++ b/backend/drm/meson.build
+@@ -16,7 +16,7 @@ libliftoff = dependency(
+ 	'libliftoff',
+ 	version: '>=0.4.0',
+ 	fallback: 'libliftoff',
+-	required: false,
++	required: get_option('libliftoff'),
+ )
+
+ if not (hwdata.found() and libdisplay_info.found() and features['session'])
+--- a/meson.build
++++ b/meson.build
+@@ -98,6 +98,7 @@ features = {
+ internal_features = {
+ 	'xcb-errors': false,
+ 	'egl': false,
++	'libliftoff': false,
+ }
+ internal_config = configuration_data()
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -7,3 +7,4 @@ option('backends', type: 'array', choices: ['auto', 'drm', 'libinput', 'x11'], v
+ option('allocators', type: 'array', choices: ['auto', 'gbm'], value: ['auto'],
+ 	description: 'Select built-in allocators')
+ option('session', type: 'feature', value: 'auto', description: 'Enable session support')
++option('libliftoff', type: 'feature', value: 'auto', description: 'Enable support for libliftoff')
+--
+2.45.2
+

diff --git a/gui-libs/wlroots/wlroots-0.17.3-r2.ebuild b/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
similarity index 92%
rename from gui-libs/wlroots/wlroots-0.17.3-r2.ebuild
rename to gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
index 8dc3bc02f4a2..d9dee7d3ca13 100644
--- a/gui-libs/wlroots/wlroots-0.17.3-r2.ebuild
+++ b/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
@@ -23,9 +23,12 @@ IUSE="liftoff +libinput +drm +session tinywl vulkan x11-backend xcb-errors X"
 REQUIRED_USE="
 	drm? ( session )
 	libinput? ( session )
+	liftoff? ( drm )
 	xcb-errors? ( || ( x11-backend X ) )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.17-fix-automagic-libliftoff.patch" )
+
 RDEPEND="
 	>=dev-libs/wayland-1.22.0
 	media-libs/libglvnd
@@ -62,6 +65,8 @@ RDEPEND="
 		x11-base/xwayland
 	)
 "
+
+# TODO: 0.17.4 will add support for libliftoff-0.5
 DEPEND="
 	${RDEPEND}
 	liftoff? (
@@ -89,6 +94,7 @@ src_configure() {
 		$(meson_feature X xwayland)
 		-Dbackends=${meson_backends}
 		$(meson_feature session)
+		$(meson_feature liftoff libliftoff)
 	)
 
 	meson_src_configure

diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index e2f9010afd44..32f3a4f0b961 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -23,6 +23,7 @@ IUSE="liftoff +libinput +drm +session tinywl lcms vulkan x11-backend xcb-errors
 REQUIRED_USE="
 	drm? ( session )
 	libinput? ( session )
+	liftoff? ( drm )
 	xcb-errors? ( || ( x11-backend X ) )
 "
 
@@ -87,6 +88,7 @@ src_configure() {
 		-Dbackends=${meson_backends}
 		$(meson_feature session)
 		$(meson_feature lcms color-management)
+		$(meson_feature liftoff libliftoff)
 	)
 
 	meson_src_configure