[gentoo-commits] repo/gentoo:master commit in: gui-wm/gamescope/

[James Le Cuirot]

commit:     60b2060ddd27998fa79b12f2bcb76ec417ff2a0d
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 11:02:52 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May  4 11:04:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b2060d

gui-wm/gamescope: Bump to 3.14.12, drop old 3.14.2-r1

We have to temporarily bundle wlroots until 0.18 is released.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 gui-wm/gamescope/Manifest                                |  3 ++-
 ...mescope-3.14.2-r1.ebuild => gamescope-3.14.12.ebuild} | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index f4908900b8c2..d071725528b6 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,2 +1,3 @@
-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
+DIST wlroots-a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz 620424 BLAKE2B 
83630b77983009a36fa4f168bbe2eceb73f634f9dd149cc5e6b18fbf647245a32a5d31dc3fbd0d1bed1d0dafc4cbb2fcea3ee4b4f5660a35ca37eff4679b80a2
 SHA512 
6857ded750fda91d55e53edfc270eb4e7bf44d7330d17c8fcd13c248c71abba685f34260d1e6d20cdb302a8d4f9158fb43421943cca74630fd780a4048aed07b

diff --git a/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild 
b/gui-wm/gamescope/gamescope-3.14.12.ebuild
similarity index 84%
rename from gui-wm/gamescope/gamescope-3.14.2-r1.ebuild
rename to gui-wm/gamescope/gamescope-3.14.12.ebuild
index ad468106e2c1..2d88224ccca0 100644
--- a/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild
+++ b/gui-wm/gamescope/gamescope-3.14.12.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,12 @@ 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(+)]
        >=media-libs/libavif-1.0.0:=
        >=media-libs/libdisplay-info-0.1.1
        media-libs/libsdl2[video,vulkan]
@@ -65,7 +69,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 +101,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() {
@@ -109,3 +117,7 @@ src_configure() {
        )
        meson_src_configure
 }
+
+src_install() {
+       meson_src_install --skip-subprojects
+}