Merge branch 'edge' into next

5 files changed, 110 insertions, 27 deletions

diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index e4bc0fdd0cd0..63572b27b891 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,5 +1,7 @@
-AUX wlroots-0.8.1-eglmesaextfix.patch 655 BLAKE2B 94a8e4271037360ee13ebd86852b542426b2a7e7a7bc2df30b74ab57e246b757e7a9ef71f82dc73d7a9c2a352116e13eeddb957c0ca931aad8eb1c9baf729c48 SHA512 2bffe4e80e01902640ec7e585f277a008d3b35568d61a79398659e32fa1aa69b5f9784c3eb931c0851cf1c76f42435887618a14aba0515542ed0b03ebf0eaa42
+AUX wlroots-gcc-10.patch 1020 BLAKE2B a3548355bd2374e590c83b873d1381f76857891aca5372190cf11e5e58bbd5d6909ea204674537bd3c5955cd2ef19d6cc3589dad5520a989dcdcf3ea4a694d07 SHA512 e09695602898104e03a6fa4d05fde2b617ef536460ae0ea1c9a5d35f704fe4d114bc405652f499570593a1b8cc61c5d0bd219bab5529d254f519e73ee23852a1
 DIST wlroots-0.10.0.tar.gz 454540 BLAKE2B 0d2326a62267019001be5f0d79c7b5c937ed20b952c92f0dd8cb04c3a0c06f3ef58723f552b1da1b947ea50ad91df46a543ec9705dad588db800bfa944743d11 SHA512 0e8e0c37f1afb1d99f0ecb3c2282992ffd06381aaa396c7234ead9f3ff2d5c599e766b677680ebaecf68e792054c3e42657d24f32d08bc8bcf35f9eb4bdaa876
-EBUILD wlroots-0.10.0.ebuild 1838 BLAKE2B c383f85f226ccfef6e1bbb010807e686bafa5f928de293511e98c722ff750cbcdf8e3454db0124c5fc95705bdc3cffaab1bb0769b5b7f43511963f7b28e62d0e SHA512 42834ed2a8eb610606cfae6d813f1fb3a6a57f5cf85f6daefd1feb61324d3a32ae7a549f6ceb844414097eb43f05027655b546678ebb0b8fe5d956ee82438167
+DIST wlroots-0.10.1.tar.gz 455232 BLAKE2B 0f4def61d8501b7746ccc589d59586b3641340fb7633b0c4a7b518f1b1b5285c1ee71fb629aa0a0e649c15a4ae69b5cfbc7a034c96e545765a96ddda35f10609 SHA512 e1af5a5b6484b5f4060090e13d22d699d5aaa6926e1a6b1043d2b900f88a002ed67dacf8498f23ed3008bf8a35500f415f95b3dbcf50de5da354f309f9161d58
+EBUILD wlroots-0.10.0.ebuild 1882 BLAKE2B c438d4d1e895ad8c539ccfd69f32a80ceb609b139e2b14929f6e5d173184e01026978531919805b3602530813ecbbc5abe5393933b1fe34bf374b86f830129f5 SHA512 269a1ec002a5e80bc5384833025135eadba865e106009d214fa24271066344d1a8876d7b1832483a78ffdd59f1b2e2d009c26eeee1370027132ddc16bd12ba7b
+EBUILD wlroots-0.10.1.ebuild 1949 BLAKE2B 3e7e878846b1d2911b3fe2f34483757e48c918fe33ecf7b84cd664992b070bbb96a2e1495a85c7e58631231708384116b251ebf4f5c41f1f1820c6090732ae05 SHA512 28a91c1e0c5ed36e4b6f4c47d8f8609b8762936172b5ad22dd464e76041690930b80dbee5af01d4680ad6215af8ef55aa69cea3fc9e2d98b2e2fbbc58859c29e
 EBUILD wlroots-9999.ebuild 1843 BLAKE2B f6e787d25eb5f8eba9d2e89633f81102838ebf66078cfa13a77d0d2ea4f9855296071aa0efb69ca8cb4f90af02c813a2b9e31ca262318240df7464425ed35f55 SHA512 6e7d5fbf03074fea6472cd1ce843778dff9933130dc4ce667124b53db4b84e4eab235215ff6eeedd0f678cf7f630c2a04159c6531bc209bd95c2588ab6f19471
 MISC metadata.xml 1611 BLAKE2B a52787db83324cc424c28255d7a6db05fa6ea7f92f2d5d7cd6ac4121e89f77b9e642be4ecccdb5b75be2f4ac9b1434f98d40743ae86be8044165f70cc59add65 SHA512 b04fbd1afea30e057f0feea17d05195fb76bf872aa80b5d5d6f20ac47a99c08c3703bee65b2352587a6ac588974a7da375228b439c82f861bdefa41537278a99
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 614d0c7a2cd4..000000000000
--- 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>
- 
diff --git a/gui-libs/wlroots/files/wlroots-gcc-10.patch b/gui-libs/wlroots/files/wlroots-gcc-10.patch
new file mode 100644
index 000000000000..44e1cb7d89b0
--- /dev/null
+++ b/gui-libs/wlroots/files/wlroots-gcc-10.patch
@@ -0,0 +1,26 @@
+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);
diff --git a/gui-libs/wlroots/wlroots-0.10.0.ebuild b/gui-libs/wlroots/wlroots-0.10.0.ebuild
index f408a513a4de..00bde310ba80 100644
--- a/gui-libs/wlroots/wlroots-0.10.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.10.0.ebuild
@@ -47,6 +47,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
+
 src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
diff --git a/gui-libs/wlroots/wlroots-0.10.1.ebuild b/gui-libs/wlroots/wlroots-0.10.1.ebuild
new file mode 100644
index 000000000000..49ac9be701a4
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.10.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/10"
+IUSE="elogind icccm systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.9.0:0=
+	>=dev-libs/wayland-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	virtual/pkgconfig
+"
+
+# Patch is in upstream master. Probably drop on 0.10.2 or 0.11.
+PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}