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

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

[Miroslav Šulc]

commit:     538863262c9cb2058f9495757bf098f292b39193
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 15:23:09 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 15:23:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53886326

gui-wm/gamescope: adjusted to the latest stb version

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/gamescope-3.14.0-deprecated-stb.patch    | 22 ++++++++++++++++++++++
 ...pe-3.14.0.ebuild => gamescope-3.14.0-r1.ebuild} |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/gui-wm/gamescope/files/gamescope-3.14.0-deprecated-stb.patch b/gui-wm/gamescope/files/gamescope-3.14.0-deprecated-stb.patch
new file mode 100644
index 000000000000..9168ed94aa6b
--- /dev/null
+++ b/gui-wm/gamescope/files/gamescope-3.14.0-deprecated-stb.patch
@@ -0,0 +1,22 @@
+--- a/src/reshade_effect_manager.cpp
++++ b/src/reshade_effect_manager.cpp
+@@ -14,7 +14,7 @@
+ 
+ #include <stb_image.h>
+ #define STB_IMAGE_RESIZE_IMPLEMENTATION
+-#include <stb_image_resize.h>
++#include <deprecated/stb_image_resize.h>
+ 
+ #include <unistd.h>
+ #include <sys/types.h>
+--- a/src/steamcompmgr.cpp
++++ b/src/steamcompmgr.cpp
+@@ -108,7 +108,7 @@ static const int g_nBaseCursorScale = 36;
+ #define STB_IMAGE_WRITE_IMPLEMENTATION
+ #include <stb_image.h>
+ #include <stb_image_write.h>
+-#include <stb_image_resize.h>
++#include <deprecated/stb_image_resize.h>
+ 
+ #define GPUVIS_TRACE_IMPLEMENTATION
+ #include "gpuvis_trace_utils.h"

diff --git a/gui-wm/gamescope/gamescope-3.14.0.ebuild b/gui-wm/gamescope/gamescope-3.14.0-r1.ebuild
similarity index 96%
rename from gui-wm/gamescope/gamescope-3.14.0.ebuild
rename to gui-wm/gamescope/gamescope-3.14.0-r1.ebuild
index 1d1283d27766..bacc3a1b2891 100644
--- a/gui-wm/gamescope/gamescope-3.14.0.ebuild
+++ b/gui-wm/gamescope/gamescope-3.14.0-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	<dev-libs/stb-20231010
+	>=dev-libs/stb-20240201-r1
 	dev-util/vulkan-headers
 	<media-libs/glm-1.0.0
 	dev-util/spirv-headers
@@ -62,6 +62,8 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+PATCHES=( "${FILESDIR}/${P}-deprecated-stb.patch" )
+
 FILECAPS=(
 	cap_sys_nice usr/bin/${PN}
 )

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

[James Le Cuirot]

commit:     13bcdfa3864c0aabf36ea7169500155bfeb9f413
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  9 15:27:25 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Mar  9 15:31:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bcdfa3

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

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

 gui-wm/gamescope/Manifest                                        | 2 +-
 ....14.0-deprecated-stb.patch => gamescope-deprecated-stb.patch} | 0
 .../{gamescope-3.14.0-r1.ebuild => gamescope-3.14.2.ebuild}      | 9 +++------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index ca8c12d873cc..f4908900b8c2 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,2 +1,2 @@
-DIST gamescope-3.14.0.tar.gz 474625 BLAKE2B 4065cf0957bd6e68eb31eff20ccfae3bb3a599f7398b97411c4bea3734fbf555e5d2326de434d1faf437571ec162f4e5d270ef7b48f23e3ca6806f2dac1703c5 SHA512 b2bcd9a4154db6380d29e9f3536ca73ed3e09d589c6446f80f373674dfa3cbb4b9b77ccb82209cc68258fc0f887bb15ebf479acc7091d14073a1c2bd65632d00
+DIST gamescope-3.14.2.tar.gz 486053 BLAKE2B 21433465da95e6b03b87d76c2fcb36f7f93bb9294903c6728c4b0e87916c61559a9328976eb4bfdb5bcb52dfa13265b748e924fd2e8b4701a37c63ce7a36a263 SHA512 bbdf403da8665b0dc3df6cddb6b5acf96f2af9ff8febda1a3d2c4ca5a6cd75b8580063fc6fe8d94c5cf96c9c560ead7b0870558ebefaaea87dc5b2a19d3fcc24
 DIST reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz 1543894 BLAKE2B 5e2b643ffbbda3ad078deb075a6fada1d0a560c6d865b7febee6a8eaade83ec90db3c5a8f4130d27b6dfaa8ee7b899edd214c23c947678eed28fb8e7165d9bd2 SHA512 4565d094e1c2d53d5073b4976874665d38dcf7ca86e982e569cc76923eaa9187fa32a4385fc577a3a867d2917596e6377e5a023a34bc2d389ff899d5b69764fb

diff --git a/gui-wm/gamescope/files/gamescope-3.14.0-deprecated-stb.patch b/gui-wm/gamescope/files/gamescope-deprecated-stb.patch
similarity index 100%
rename from gui-wm/gamescope/files/gamescope-3.14.0-deprecated-stb.patch
rename to gui-wm/gamescope/files/gamescope-deprecated-stb.patch

diff --git a/gui-wm/gamescope/gamescope-3.14.0-r1.ebuild b/gui-wm/gamescope/gamescope-3.14.2.ebuild
similarity index 88%
rename from gui-wm/gamescope/gamescope-3.14.0-r1.ebuild
rename to gui-wm/gamescope/gamescope-3.14.2.ebuild
index bacc3a1b2891..15019e57277d 100644
--- a/gui-wm/gamescope/gamescope-3.14.0-r1.ebuild
+++ b/gui-wm/gamescope/gamescope-3.14.2.ebuild
@@ -62,7 +62,9 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-PATCHES=( "${FILESDIR}/${P}-deprecated-stb.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-deprecated-stb.patch
+)
 
 FILECAPS=(
 	cap_sys_nice usr/bin/${PN}
@@ -71,11 +73,6 @@ FILECAPS=(
 src_prepare() {
 	default
 
-	# Normally wraps stb with Meson. Upstream does not ship a pkg-config file so
-	# we don't install one. Work around this using symlinks.
-	mkdir subprojects/stb || die
-	ln -sn "${ESYSROOT}"/usr/include/stb/* "${S}"/subprojects/packagefiles/stb/* subprojects/stb/ || die
-
 	# 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