gentoo auto-resync : 05:05:2024 - 00:00:45

5 files changed, 37 insertions, 10 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 27c7b31b4fad..b238b8b08d4a 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index ea1d2db85259..004402af1beb 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,5 +1,6 @@
 AUX gamescope-deprecated-stb.patch 634 BLAKE2B 33bd10dc41f9fdbbec12ea0bdec1cf8af8fc9bc499324f5f2f329c72273109fd82495a0f3d3ffb2954ee91eb106f7e36479716af6e8d2cfd76ef58c9074003d3 SHA512 56aceec2552868749a21c9ca06ac6b41da3bd901692b376e5691155c58861f941dbd5359f1e22bbe54fd14e061cd586fe06d0109a8a45a0ecf6049ea3a79663b
-DIST gamescope-3.14.2.tar.gz 486053 BLAKE2B 21433465da95e6b03b87d76c2fcb36f7f93bb9294903c6728c4b0e87916c61559a9328976eb4bfdb5bcb52dfa13265b748e924fd2e8b4701a37c63ce7a36a263 SHA512 bbdf403da8665b0dc3df6cddb6b5acf96f2af9ff8febda1a3d2c4ca5a6cd75b8580063fc6fe8d94c5cf96c9c560ead7b0870558ebefaaea87dc5b2a19d3fcc24
+DIST gamescope-3.14.12.tar.gz 511675 BLAKE2B 3a60989486ee2f92c97b54fb77fa38dfa59e713ef0c3207e92aed8bae97b71da536e73ebce735a29ef2707d5278eb7312ecaf138fc6dbb9043483ff7247fbfb5 SHA512 13a3e7a7f84c8de55731ec84b389b579c2ec2e1cb51d690cc24758cedffe848c3f6dfbaf2b40bec2bed9692c6980d3bab6fa44350a452fd8d46ebe59e1309ec5
 DIST reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz 1543894 BLAKE2B 5e2b643ffbbda3ad078deb075a6fada1d0a560c6d865b7febee6a8eaade83ec90db3c5a8f4130d27b6dfaa8ee7b899edd214c23c947678eed28fb8e7165d9bd2 SHA512 4565d094e1c2d53d5073b4976874665d38dcf7ca86e982e569cc76923eaa9187fa32a4385fc577a3a867d2917596e6377e5a023a34bc2d389ff899d5b69764fb
-EBUILD gamescope-3.14.2-r1.ebuild 2791 BLAKE2B 9d5eada20df1053169456b7b993cd616d2717ee2c1446472666cf836a8e4e96587d9421f9f82b754ee78275969642ea8c8d589351b57709c053725d22162d296 SHA512 102a4aefb0e12e18f5e01f8f8006933ccd8fda5a3d90ebcee3d7fa5b4b99d86ddbccacac12e71ee17e43550e4ef30ab1c8a1e273708fabfec0e8b5485506c667
+DIST wlroots-a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz 620424 BLAKE2B 83630b77983009a36fa4f168bbe2eceb73f634f9dd149cc5e6b18fbf647245a32a5d31dc3fbd0d1bed1d0dafc4cbb2fcea3ee4b4f5660a35ca37eff4679b80a2 SHA512 6857ded750fda91d55e53edfc270eb4e7bf44d7330d17c8fcd13c248c71abba685f34260d1e6d20cdb302a8d4f9158fb43421943cca74630fd780a4048aed07b
+EBUILD gamescope-3.14.12-r2.ebuild 3608 BLAKE2B e304f67f0f6c9f168dea8cf8d8dad679c46362ec5c60b48dcdf0cdfedf4d385048f09efe8b5e21f4ce4a97759d4dc8fb680745f56106faa64b4b5bdc5a5ef4c4 SHA512 9f2d53abffd25a92ab85bce7615352e363a72632045d69b659bf7111148dd6185af643a5d79f052183a8a83289acdd180353074b982bbb73bc75be4e9b757d6d
 MISC metadata.xml 489 BLAKE2B 6930da0ca2827741a902e064b3bca71266ac5c2e61d7cf6d566c37e971efd04b2fcd2381659e1d5babe6fd05dd4d06979c0d82b3ac5e2702bb5d3311ef30df79 SHA512 419f4a3f3dc7a940d0f157323b9afd116b4a4d2efc718eb5979d84677b770a606c532d0777dbed1b6598afa393894e5dc9982dbaf7e31c90a9e0b433938d4e55
diff --git a/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild b/gui-wm/gamescope/gamescope-3.14.12-r2.ebuild
index ad468106e2c1..dd27cbde375a 100644
--- a/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild
+++ b/gui-wm/gamescope/gamescope-3.14.12-r2.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit fcaps meson
 
 RESHADE_COMMIT="9fdbea6892f9959fdc18095d035976c574b268b7"
+WLROOTS_COMMIT="a5c9826e6d7d8b504b07d1c02425e6f62b020791"
 MY_PV=$(ver_rs 3 -)
 MY_PV="${MY_PV//_/-}"
 
@@ -21,6 +22,7 @@ else
 	SRC_URI="
 		https://github.com/ValveSoftware/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/Joshua-Ashton/reshade/archive/${RESHADE_COMMIT}.tar.gz -> reshade-${RESHADE_COMMIT}.tar.gz
+		https://github.com/Joshua-Ashton/wlroots/archive/${WLROOTS_COMMIT}.tar.gz -> wlroots-${WLROOTS_COMMIT}.tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -31,10 +33,13 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="pipewire +wsi-layer"
 
+# For when wlroots 0.18 is released.
+# =gui-libs/wlroots-0.18*[X,libinput(+)]
+
 RDEPEND="
 	=dev-libs/libliftoff-0.4*
 	>=dev-libs/wayland-1.21
-	=gui-libs/wlroots-0.17*[X,libinput(+)]
+	gui-libs/libdecor
 	>=media-libs/libavif-1.0.0:=
 	>=media-libs/libdisplay-info-0.1.1
 	media-libs/libsdl2[video,vulkan]
@@ -57,6 +62,16 @@ RDEPEND="
 	x11-libs/libXxf86vm
 	pipewire? ( >=media-video/pipewire-0.3:= )
 	wsi-layer? ( x11-libs/libxcb )
+
+	>=dev-libs/libinput-1.14.0:=
+	media-libs/libglvnd
+	media-libs/mesa[egl(+),gles2(+)]
+	sys-auth/seatd:=
+	virtual/libudev
+	x11-base/xwayland
+	x11-libs/libxcb:=
+	>=x11-libs/pixman-0.42.0
+	x11-libs/xcb-util-wm
 "
 DEPEND="
 	${RDEPEND}
@@ -65,7 +80,7 @@ DEPEND="
 	dev-util/vulkan-headers
 	media-libs/glm
 	dev-util/spirv-headers
-	wsi-layer? ( >=media-libs/vkroots-0_p20231108 )
+	wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
 "
 BDEPEND="
 	dev-util/glslang
@@ -97,6 +112,10 @@ src_prepare() {
 	# For 9999, this submodule is not included.
 	mkdir -p thirdparty/SPIRV-Headers/include || die
 	ln -snf "${ESYSROOT}"/usr/include/spirv thirdparty/SPIRV-Headers/include/ || die
+
+	# Until wlroots 0.18 is released.
+	rmdir subprojects/wlroots || die
+	ln -snfT ../../wlroots-${WLROOTS_COMMIT} subprojects/wlroots || die
 }
 
 src_configure() {
@@ -106,6 +125,17 @@ src_configure() {
 		-Denable_openvr_support=false
 		$(meson_feature pipewire)
 		$(meson_use wsi-layer enable_gamescope_wsi_layer)
+
+		-Dwlroots:xcb-errors=disabled
+		-Dwlroots:examples=false
+		-Dwlroots:renderers=gles2,vulkan
+		-Dwlroots:xwayland=enabled
+		-Dwlroots:backends=drm,libinput
+		-Dwlroots:session=enabled
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install --skip-subprojects
+}
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index af8106b339bf..76d4017be40b 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,5 +1,5 @@
 AUX sway-portals.conf 216 BLAKE2B d30b62bb142802e5067c2829d69faba87b07c8a36661f43473b0a107fd57d020b3dcc5e7a1967a1fca13b7a5e9140063b7285c44b766f67002213521d676b1ab SHA512 790741df028822bf4d83170dea57e1c63f7d7938cf31969e4cd347b0fc07330322b603c9ec0091b7a3f425132bed9dee6f261074cc273555120858beaaaf5da1
 DIST sway-1.9.tar.gz 5581281 BLAKE2B 11d90866e3d12a76880f41e006be5ae7f3a3b1e6cbeb2412d30b673be91be7f60523dcce2892579e1da76de1d0498e0669138aa953bf1f595b97123720812e06 SHA512 7ec0a29078eb7e0fb1b6af97613c263adec78ddb03a63cb75fb5e44c7241ed144687fd094ee2eb70f4397832ca9bdffc88bc32dee7683bf0e515417c7a05d4c4
 EBUILD sway-1.9.ebuild 2690 BLAKE2B 525da24f7b6a2cef34e8e9fdc88bf0d659a8cbe81938f57923fd830f42165e3f77db6f5ce01f4b40e59925cf71455ace91b544cdd00af6f0adb986c871a9c59b SHA512 504a560698dcdbb7402624bb9478d86f4082b16d72ab7d8c6093985129b16477078981a97aab2162462a35262d6f03cc005d419594afaa2490529417c2b44e0f
-EBUILD sway-9999.ebuild 2693 BLAKE2B 9f8bb9be70b0e00432fb1d36a2d281c780658c34f8775191860798091ad89fe088301b16c59b06fbfd8789658f967cc2e26cde7cd8681b001287f676cb62c4df SHA512 f0555473ae327b5694b9fd6b6da8eb7b2841d6eee824d63d54c4620937f6b914485d0d3dc685dda3537cd54dd9318d736f9d37437b45c976771ab959202e86ba
+EBUILD sway-9999.ebuild 2604 BLAKE2B 30b11f23111326ec38b54bb67b222b712cd9929b4a7fbb3b83ab69751358b21f89e38de0f49e4cee4cc2c6cecfeb05f2e19978cf34f35efa84d6034f5c79445b SHA512 458f99b52201846dfe23173066a85bf1f165861b63a888b42c4e2fb8e6cddf7b14e8b96f04b411f66a04a03ddb8875f7f6ac21afc3b5105c304e459596bcaf8b
 MISC metadata.xml 1721 BLAKE2B 39795f8d7c4a736141417e267e2c4645f4f963107c47516747c7fbc1643ed2e9787812c5571369b795e3648d4801dff32c062bf2db6d80ce79735d1be65b8ac8 SHA512 458d2adb61ecb91cc9d589409c69bffa7dee51328a557567e66c21eeff7e23eadaf36a04ca9fae32aa9d6edf1e28fa1bcba62f3e185699a8c08785f84977bb88
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 905df0af237e..a23327214abb 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -64,12 +64,8 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.24
 	>=dev-build/meson-0.60.0
 	virtual/pkgconfig
+	man? ( >=app-text/scdoc-1.11.3 )
 "
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
 
 FILECAPS=(
 	cap_sys_nice usr/bin/${PN} # bug 919298