gentoo xmass resync : 25.12.2021

11 files changed, 146 insertions, 8 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b8e0b74b461e..231d0096bc0a 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/egl-gbm/Manifest b/gui-libs/egl-gbm/Manifest
new file mode 100644
index 000000000000..42fc404248b3
--- /dev/null
+++ b/gui-libs/egl-gbm/Manifest
@@ -0,0 +1,5 @@
+AUX 15_nvidia_gbm.json 96 BLAKE2B ed3c97a8df4e80b969b479c46472143b81a986a9009d6cf9faed0bc99e59f977d0a9260204252151befe2d3454eac05c584776464d86aae263040f209df5ca8b SHA512 6a3e3bffb0f5352b4d8738f7b18003579664f69e062e2f50e5b8189f06a1161ee651d66e83dcb1b9338751908b4e410cbf9b98fc2e58c18269b66e3c2f2f3e34
+AUX egl-gbm-1.1.0-werror.patch 220 BLAKE2B c93b535d6f17ea35c39b61b8f655a1b9378b18260fcae319f22d94c28ec932557303d97b9e0b435006964ec5cc6a660e9e89b4823000893221dfe07a16efde39 SHA512 0c5eeea9eaaea637200314363da1cf1873a44b939287b27b0156cc05a99c274e311848ce6b69ce39df1fcf1b44deba5ec227d871db87a8785e7d0d27b447a066
+DIST egl-gbm-1.1.0.tar.gz 17165 BLAKE2B c83702635c7621d93968ed6813d3641bcc785b7e6fb0474d1e6edebf46942c799af52d22127865ff9484ef6b398a02cb6081dfc00a6e1ec8ce1882c0c980b116 SHA512 4b7856f496bd045d1ef56881ac793c9e5994bb6cfaa911de51f83bfd4adcf596c204a75cd9f1aef0418289dcef4812ace8cba23b44445e18e004bf6ad2b18421
+EBUILD egl-gbm-1.1.0.ebuild 713 BLAKE2B b680600bfc576b8d7f80aa9fcd1ebd41e4f24418b62b68e2a67a1e5879ab0c7c9e259d5091fe0d31961511424794b05ea3529c97fa77b7adabdf2e92ab76ac5f SHA512 d3e207b3f52bd6ed3cd1ba95cf20afc2c2ac49b2633c4ca7436da4d41fbfd7a5d7ee79584488954c8a507da0897d3d0caf24cde078f137c817133345ad5254a0
+MISC metadata.xml 325 BLAKE2B b7fe17481f96e0fabd321b64090bc12c09ee61de8251531a0853c668b799522480f700fd2382e16bf6aa956c3aa6d3dd0ceff76a27355994b7517cbce7d25094 SHA512 8a3bdde2a17fcec7bbc55af10d33774e4fa648a88949b06ea9f5c7c8c83b2a05c67a3a8cdfcff44eac757639184b790b17b55a574d449cd0a5186b7a5414e5df
diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild
new file mode 100644
index 000000000000..4d1b664b6bb7
--- /dev/null
+++ b/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="GBM EGL external platform library"
+HOMEPAGE="https://github.com/NVIDIA/egl-gbm"
+SRC_URI="https://github.com/NVIDIA/egl-gbm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=media-libs/mesa-21.2[gbm(+)]
+	x11-libs/libdrm
+	!<x11-drivers/nvidia-drivers-495.46-r20[wayland(-)]"
+DEPEND="
+	${RDEPEND}
+	>=media-libs/libglvnd-1.3.4
+	gui-libs/eglexternalplatform"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-werror.patch
+)
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/egl/egl_external_platform.d
+	doins "${FILESDIR}"/15_nvidia_gbm.json
+}
diff --git a/gui-libs/egl-gbm/files/15_nvidia_gbm.json b/gui-libs/egl-gbm/files/15_nvidia_gbm.json
new file mode 100644
index 000000000000..2654bebddcca
--- /dev/null
+++ b/gui-libs/egl-gbm/files/15_nvidia_gbm.json
@@ -0,0 +1,6 @@
+{
+	"file_format_version" : "1.0.0",
+	"ICD" : {
+		"library_path" : "libnvidia-egl-gbm.so.1"
+	}
+}
diff --git a/gui-libs/egl-gbm/files/egl-gbm-1.1.0-werror.patch b/gui-libs/egl-gbm/files/egl-gbm-1.1.0-werror.patch
new file mode 100644
index 000000000000..d48d98015e59
--- /dev/null
+++ b/gui-libs/egl-gbm/files/egl-gbm-1.1.0-werror.patch
@@ -0,0 +1,6 @@
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -7,3 +7,2 @@
+ add_project_arguments('-Wall', language : 'c')
+-add_project_arguments('-Werror', language : 'c')
+ add_project_arguments('-fvisibility=hidden', language : 'c')
diff --git a/gui-libs/egl-gbm/metadata.xml b/gui-libs/egl-gbm/metadata.xml
new file mode 100644
index 000000000000..b852c8d8c8d0
--- /dev/null
+++ b/gui-libs/egl-gbm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">NVIDIA/egl-gbm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gui-libs/eglexternalplatform/Manifest b/gui-libs/eglexternalplatform/Manifest
index 7006728c8a3a..bc55f59512e5 100644
--- a/gui-libs/eglexternalplatform/Manifest
+++ b/gui-libs/eglexternalplatform/Manifest
@@ -1,3 +1,3 @@
 DIST eglexternalplatform-1.1.tar.gz 10372 BLAKE2B f18bd0c5244da34343b3bde8451602b8071972d33139ab4839e7bf68eae6be5fa69a12d5059b4b259bc4eac2e97f46d4d5fa734d48e45b6a6ae69251af86cdf0 SHA512 ee72c928abac060e28515807975a371d3792acd119fa9f9da926ae32105e1e528df8d9a3db57ffac0587b115293ede44997606d9da8e20e7f7061a01dd502748
-EBUILD eglexternalplatform-1.1.ebuild 628 BLAKE2B 245e6ad513c528d105f30bd586d5548e6baef9e33983394919c79144a9ea4ebac2f6249981593297ec6d1389ae1bc1b3ba1ed96152331bea999cc1b12e965377 SHA512 0c0d9c2657b4b9b87449acca789f1b07b01c3e9d26585e9549c6745db0b06d02bdb3c0e48ae1f3bb57f09ffe3b213bf61aa68f45d4c055377ddbf716b4e46dd5
+EBUILD eglexternalplatform-1.1.ebuild 639 BLAKE2B 7d7209b02b84cb2d77a3f5109efd3fd65168a564bb8a70f49211d1b5efadc7aab091e81b453af65951a0f4868c936c215017ebe858b40a24d51110a47a616662 SHA512 63f9eb05dea63671518981a2d07c46598110f8e9501f0a6625518b67fe9b9d18951be094708bfbff8cc97884c914ebd1a5de74ce8f41a621863fee7d07ad5d20
 MISC metadata.xml 337 BLAKE2B a2a7dfac350b1030e54a00a0dc2df248682dc3cff62063d5c00fb2b4f886fab8c8d514d82a47428762fc02cdc157cf2675f69d69907d8eecbd8d7cdd27072395 SHA512 11af8546ce5bdfb600f6bbf00de5d2315a345e8038888912a840370b6f8a866c0724eb016d3b1c009333773d0c007b735832a5e19a709a10ab5e1b90fe843a70
diff --git a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
index d224b408e9f7..5bb7ad87229a 100644
--- a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
+++ b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="EGL External Platform interface"
 HOMEPAGE="https://github.com/NVIDIA/eglexternalplatform"
@@ -13,7 +13,8 @@ KEYWORDS="amd64"
 
 src_prepare() {
 	default
-	sed -i "/^inc/s@=@=${EPREFIX}@" eglexternalplatform.pc || die
+
+	use !prefix || sed -i "/^inc/s|=|=${EPREFIX}|" eglexternalplatform.pc || die
 }
 
 src_install() {
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index aba22d7acb41..dcfd8b04dbfe 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,6 +1,8 @@
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0
+DIST wlroots-0.15.0.tar.gz 565059 BLAKE2B d98529b4548e3b751a505a26af143be585ed42fb9617bc67b4a10747bb494f1359d7bdb75d1730a72396e7c550fe481e858a5ac88621d61671698439e3656920 SHA512 730b1e0cf003dabae23101664c6d1993636bd3a8ecbdb3c165eef415a92811c4d5228f48e0275f75361d8528f118dfb8a2298cfb05dbf6364539224ceedca447
 EBUILD wlroots-0.14.0-r2.ebuild 1500 BLAKE2B 766fa524353658f542c648281b05e9871140ee5272f160fbcbc36a28a48246d83494c6bd3e02ebbd16e1527c61139ea00ec00085d68a2a0b87b2b06347b2fa12 SHA512 22fc3dd03ec1c1a719bba7990b264dbb789445ba56afbff0c8e6aec6765b9a0a30ad4a27469f7d5a5ffa95848e861615aaa75a418ad6c771caec5b2179feeb21
 EBUILD wlroots-0.14.1-r1.ebuild 1503 BLAKE2B 12a12358ec5b012bb94a58d2aa20bbff7ddbf3fb34f06c1b6380429cec6fe9952ec53c85ea6607d1b0261a9c00060bdae71a23a40bc4f217c4fb8e0d28ee2853 SHA512 2a555ab4b3dc620394a4a9a975cbad6075757f27c85ee120448e6e0eb28c92ead7bbdd51ef935a104efafe8f5cb2f163f95f8fba6668258d8be996328027402f
-EBUILD wlroots-9999.ebuild 1657 BLAKE2B fe587ae1a0f397d78bf02f3a80da1f0ddb1f3e618f98db49fc00d19d72d28aeaf7ad734305f9a1dd4969bdb4a33aa6bd82b52446f511c8bbb9a7683c616b4fd1 SHA512 73ab6241b380d4cb08b80b08400fe50097cc73a6f8851f4a8107c17a4c8bbe528e473e2ce54972604e66ba51b8701aef30c4af7a9d28df1d7390dea501fe2291
+EBUILD wlroots-0.15.0.ebuild 1688 BLAKE2B 0586d218ad09988216977106910ce85f453abcdc7614c1eb9698c0e5a5f0650b404a1afd1df4ddb55450d02403d0f721d59a56c66e6a6aa9ef80d9c31937b5c7 SHA512 3c633667a8fd7b2d1800f28f23699ea99e2cea01780d7ec40b59d68c65598eebb1cfad17d43528f25e28862782dd7d5bd2639dc4d6180b9fa54983730404e40b
+EBUILD wlroots-9999.ebuild 1688 BLAKE2B 0586d218ad09988216977106910ce85f453abcdc7614c1eb9698c0e5a5f0650b404a1afd1df4ddb55450d02403d0f721d59a56c66e6a6aa9ef80d9c31937b5c7 SHA512 3c633667a8fd7b2d1800f28f23699ea99e2cea01780d7ec40b59d68c65598eebb1cfad17d43528f25e28862782dd7d5bd2639dc4d6180b9fa54983730404e40b
 MISC metadata.xml 1545 BLAKE2B 561769f8f3911ce04fabf9300f08f264a15c3196009a1334601f3094409eef2c869b622997f5e31d7c7c5d9e05507124d62306e8aa0d635b535b6bbcd7d9e7ba SHA512 4f1ff86f60ec2c723682d0cdc9f4dd696af73c77e68937f53ab11641e8fc443f0a99c8f28ec6b844fe230bb493749e676a243a16bea7096635f68c3ae432f0ae
diff --git a/gui-libs/wlroots/wlroots-0.15.0.ebuild b/gui-libs/wlroots/wlroots-0.15.0.ebuild
new file mode 100644
index 000000000000..395649f12eb2
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.15.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SLOT="0/14"
+fi
+
+LICENSE="MIT"
+IUSE="vulkan x11-backend X"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.20.0
+	>=dev-libs/wayland-protocols-1.24
+	media-libs/mesa[egl(+),gles2,gbm(+)]
+	sys-auth/seatd:=
+	virtual/libudev
+	vulkan? (
+		dev-util/glslang:0=
+		dev-util/vulkan-headers:0=
+		media-libs/vulkan-loader:0=
+	)
+	>=x11-libs/libdrm-2.4.109:0=
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		"-Dexamples=false"
+		"-Dwerror=false"
+		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index df7d512ad5c5..395649f12eb2 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	SLOT="0/9999"
 else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	SLOT="0/14"
 fi
@@ -23,7 +23,7 @@ IUSE="vulkan x11-backend X"
 
 DEPEND="
 	>=dev-libs/libinput-1.14.0:0=
-	>=dev-libs/wayland-1.19.0
+	>=dev-libs/wayland-1.20.0
 	>=dev-libs/wayland-protocols-1.24
 	media-libs/mesa[egl(+),gles2,gbm(+)]
 	sys-auth/seatd:=
@@ -33,7 +33,7 @@ DEPEND="
 		dev-util/vulkan-headers:0=
 		media-libs/vulkan-loader:0=
 	)
-	x11-libs/libdrm
+	>=x11-libs/libdrm-2.4.109:0=
 	x11-libs/libxkbcommon
 	x11-libs/pixman
 	x11-backend? ( x11-libs/libxcb:0= )