gentoo auto-resync : 11:04:2024 - 00:32:37

3 files changed, 25 insertions, 10 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 58c77d5d8d11..2308857320c3 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index 73ad31a6fdd5..ea1d2db85259 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,5 +1,5 @@
 AUX gamescope-deprecated-stb.patch 634 BLAKE2B 33bd10dc41f9fdbbec12ea0bdec1cf8af8fc9bc499324f5f2f329c72273109fd82495a0f3d3ffb2954ee91eb106f7e36479716af6e8d2cfd76ef58c9074003d3 SHA512 56aceec2552868749a21c9ca06ac6b41da3bd901692b376e5691155c58861f941dbd5359f1e22bbe54fd14e061cd586fe06d0109a8a45a0ecf6049ea3a79663b
 DIST gamescope-3.14.2.tar.gz 486053 BLAKE2B 21433465da95e6b03b87d76c2fcb36f7f93bb9294903c6728c4b0e87916c61559a9328976eb4bfdb5bcb52dfa13265b748e924fd2e8b4701a37c63ce7a36a263 SHA512 bbdf403da8665b0dc3df6cddb6b5acf96f2af9ff8febda1a3d2c4ca5a6cd75b8580063fc6fe8d94c5cf96c9c560ead7b0870558ebefaaea87dc5b2a19d3fcc24
 DIST reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz 1543894 BLAKE2B 5e2b643ffbbda3ad078deb075a6fada1d0a560c6d865b7febee6a8eaade83ec90db3c5a8f4130d27b6dfaa8ee7b899edd214c23c947678eed28fb8e7165d9bd2 SHA512 4565d094e1c2d53d5073b4976874665d38dcf7ca86e982e569cc76923eaa9187fa32a4385fc577a3a867d2917596e6377e5a023a34bc2d389ff899d5b69764fb
-EBUILD gamescope-3.14.2.ebuild 2417 BLAKE2B 8da721c904c4291732150426a54b2bde581aa7f9e6522a125f3af9101a28ce65feb27a5771ad70270797f339d930d253e3ddd9104a2fcacae90e7ae43491a7a3 SHA512 e210764f4576bbb8fc55098b9876acf79d87cf6c46dacec869026250de9d14a2947c884024e3cd77b3979fc26b55ad36697e97e5c1b8a2b1009c21cdd540a0ea
+EBUILD gamescope-3.14.2-r1.ebuild 2791 BLAKE2B 9d5eada20df1053169456b7b993cd616d2717ee2c1446472666cf836a8e4e96587d9421f9f82b754ee78275969642ea8c8d589351b57709c053725d22162d296 SHA512 102a4aefb0e12e18f5e01f8f8006933ccd8fda5a3d90ebcee3d7fa5b4b99d86ddbccacac12e71ee17e43550e4ef30ab1c8a1e273708fabfec0e8b5485506c667
 MISC metadata.xml 489 BLAKE2B 6930da0ca2827741a902e064b3bca71266ac5c2e61d7cf6d566c37e971efd04b2fcd2381659e1d5babe6fd05dd4d06979c0d82b3ac5e2702bb5d3311ef30df79 SHA512 419f4a3f3dc7a940d0f157323b9afd116b4a4d2efc718eb5979d84677b770a606c532d0777dbed1b6598afa393894e5dc9982dbaf7e31c90a9e0b433938d4e55
diff --git a/gui-wm/gamescope/gamescope-3.14.2.ebuild b/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild
index be1fd59217bd..ad468106e2c1 100644
--- a/gui-wm/gamescope/gamescope-3.14.2.ebuild
+++ b/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild
@@ -11,9 +11,22 @@ MY_PV="${MY_PV//_/-}"
 
 DESCRIPTION="Efficient micro-compositor for running games"
 HOMEPAGE="https://github.com/ValveSoftware/gamescope"
-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"
-KEYWORDS="~amd64"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/ValveSoftware/${PN}.git"
+	# Prevent wlroots and other submodule from being pull
+	# Not messing with system packages
+	EGIT_SUBMODULES=( src/reshade )
+	inherit git-r3
+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
+	"
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="pipewire +wsi-layer"
@@ -21,7 +34,6 @@ IUSE="pipewire +wsi-layer"
 RDEPEND="
 	=dev-libs/libliftoff-0.4*
 	>=dev-libs/wayland-1.21
-	>=dev-libs/wayland-protocols-1.17
 	=gui-libs/wlroots-0.17*[X,libinput(+)]
 	>=media-libs/libavif-1.0.0:=
 	>=media-libs/libdisplay-info-0.1.1
@@ -48,6 +60,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	>=dev-libs/wayland-protocols-1.34
 	>=dev-libs/stb-20240201-r1
 	dev-util/vulkan-headers
 	media-libs/glm
@@ -60,8 +73,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-deprecated-stb.patch
 )
@@ -75,12 +86,16 @@ src_prepare() {
 
 	# ReShade is bundled as a git submodule, but it references an unofficial
 	# fork, so we cannot unbundle it. Symlink to its extracted sources.
-	rmdir src/reshade || die
-	ln -snfT ../../reshade-${RESHADE_COMMIT} src/reshade || die
+	# For 9999, use the bundled submodule.
+	if [[ ${PV} != "9999" ]]; then
+		rmdir src/reshade || die
+		ln -snfT ../../reshade-${RESHADE_COMMIT} src/reshade || die
+	fi
 
 	# SPIRV-Headers is required by ReShade. It is bundled as a git submodule but
 	# not wrapped with Meson, so we can symlink to our system-wide headers.
-	mkdir thirdparty/SPIRV-Headers/include || die
+	# 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
 }