* [gentoo-commits] repo/gentoo:master commit in: gui-wm/gamescope/files/, gui-wm/gamescope/
@ 2025-06-22 21:32 James Le Cuirot
0 siblings, 0 replies; only message in thread
From: James Le Cuirot @ 2025-06-22 21:32 UTC (permalink / raw
To: gentoo-commits
commit: ca0e6ae182e38cd574a75a9488729405705f4d30
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 22 21:30:24 2025 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 22 21:31:52 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca0e6ae1
gui-wm/gamescope: Bump to 3.16.14, drop old 3.16.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
gui-wm/gamescope/Manifest | 4 ++--
gui-wm/gamescope/files/gamescope-subprojects.patch | 25 ++++++++++++++++++++++
...cope-3.16.2.ebuild => gamescope-3.16.14.ebuild} | 23 ++++++++++++--------
3 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index 61b5b179f156..983ad6de791b 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,5 +1,5 @@
-DIST gamescope-3.16.2.tar.gz 748603 BLAKE2B 84bc767991fa02b8dceecd96d30639caed6fde0875fba577c86f6adfb8e40e88e45556038d86ea363de2ec620b1721ac553a57eaa18c7cd33fd32a799d753166 SHA512 91d712965df069f408c322d2bc4115688fe08af242d952d69feb35e638ba44557f4ff4826095cccdb3e208cfbc209418ad99a3e39ab6d96dfa81891ae46e74e1
+DIST gamescope-3.16.14.tar.gz 798307 BLAKE2B bceca4f294143630af9f2e5decbc4f8855acac70ecb292a0627a070ab7b6c717db58f0c2759ff02642889c17d2645ebc03b2404d24567624e5002de3147dc36b SHA512 608641a7a65f95c56a88a7c611502144ff2520733e7318caa6a69b9b4a62c4fd89f76b5be29e3658b2305ab205f4bda598b6de449a3b0e4d9788cae40a09532e
DIST libliftoff-0.5.0.tar.gz 39076 BLAKE2B a5c35c734a5ba4049661ce336401bd88d393001d7c49786d486146998d39530c364f7752b53968f5ab48f5eb774fa9c4245087bdb016f459a729991377023f61 SHA512 ce808f6a087f1f629cfebef95bfc7e216a09fb409b96b3c9f6b84d9d986ce50c5d7bf5b45c68e8baa99566b3627d754c269855b6f4ec3be63ae7b9f5109d5f08
DIST reshade-696b14cd6006ae9ca174e6164450619ace043283.tar.gz 1684777 BLAKE2B 3b2fcd1ed53dd6a8c459cf716697eec8a21f6fd9c25e4f6baa752e4226eaf35837e0f1595eef065a064bb0d76b1b067f643cd14ef896875448c99f57e10e6fb9 SHA512 7fe1fe07622efd90bd94e1755019ca47657acd07137669e00b97bf70017a58c1f699e3dec1c720caafd1296275c7a25fd2f4d6e478cebbdf48bd69f985a00cdf
DIST vkroots-5106d8a0df95de66cc58dc1ea37e69c99afc9540.tar.gz 352651 BLAKE2B bc6c7a4f5b4f810c4d87a6cef46e73adb292bc22ae9a40666a6c7c8ab0cbc1973af405b32a5c7a3d38623c92e5d41e8472dabb744fcf31cf29118b9684dcfc32 SHA512 726e65dd0bb322d537e985ba2e504c68ef1b474574f11a5b102edcb8a7b74a6d86dea132c3b11417399a00beff9163e7aad413a389cf6073ec44d5ce6175ffc5
-DIST wlroots-4bc5333a2cbba0b0b88559f281dbde04b849e6ef.tar.gz 629328 BLAKE2B c48ff80616a82529ea0b503204557a41be8f8ad8fb60d0f5ae155a237d97117f3551f7992957a03c08fec6374e2087483052712a173fd422c5236f619a16bc64 SHA512 60731f5ce90e061d674168d42c2d4e02766f85b8b1566611022fc930feb181d16906ac23e92f999c90fa6b48c769279520de12a9abeae20c5553b6ccdd31427e
+DIST wlroots-54e844748029d4874e14d0c086d50092c04c8899.tar.gz 629399 BLAKE2B 39c5bb55167481b35aaf03f3ee0d34ef33319ac9c2dd940e3b1429a2a2292cf0bcf33040d14904339fdde6fec25f4bc945fc88ed898395393ea8885276e2008a SHA512 2544de0fe0d51c5f4156e4f4893b351795584d8e9ecd192296317e5d4c3e48ce53ba18da38cf18c0bdf076810e8030595d3da821ab62a16a53cee91cbf03e088
diff --git a/gui-wm/gamescope/files/gamescope-subprojects.patch b/gui-wm/gamescope/files/gamescope-subprojects.patch
new file mode 100644
index 000000000000..cb9b19a5429c
--- /dev/null
+++ b/gui-wm/gamescope/files/gamescope-subprojects.patch
@@ -0,0 +1,25 @@
+From aa55fc7dce7b319f2979ad4c61493a43ac10069d Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 22 Jun 2025 22:24:34 +0100
+Subject: [PATCH] Don't pull in glm and stb as subprojects
+
+Upstream has concerns over which versions might be installed system-wide, but
+Gentoo has control over that.
+--- a/meson.build
++++ b/meson.build
+@@ -50,10 +50,8 @@ dep_x11 = dependency('x11')
+ dep_wayland = dependency('wayland-client')
+ vulkan_dep = dependency('vulkan')
+
+-glm_proj = subproject('glm')
+-glm_dep = glm_proj.get_variable('glm_dep')
+-stb_proj = subproject('stb')
+-stb_dep = stb_proj.get_variable('stb_dep')
++glm_dep = dependency('glm')
++stb_dep = dependency('stb')
+
+ if get_option('enable_openvr_support')
+ openvr_dep = dependency('openvr', version: '>= 2.7', required : false)
+--
+2.49.0
+
diff --git a/gui-wm/gamescope/gamescope-3.16.2.ebuild b/gui-wm/gamescope/gamescope-3.16.14.ebuild
similarity index 88%
rename from gui-wm/gamescope/gamescope-3.16.2.ebuild
rename to gui-wm/gamescope/gamescope-3.16.14.ebuild
index 6fae2a06c02b..f67528722743 100644
--- a/gui-wm/gamescope/gamescope-3.16.2.ebuild
+++ b/gui-wm/gamescope/gamescope-3.16.14.ebuild
@@ -19,7 +19,7 @@ else
RESHADE_COMMIT="696b14cd6006ae9ca174e6164450619ace043283"
LIBLIFTOFF_COMMIT="0.5.0" # Upstream points at this release.
VKROOTS_COMMIT="5106d8a0df95de66cc58dc1ea37e69c99afc9540"
- WLROOTS_COMMIT="4bc5333a2cbba0b0b88559f281dbde04b849e6ef"
+ WLROOTS_COMMIT="54e844748029d4874e14d0c086d50092c04c8899"
SRC_URI="
https://github.com/ValveSoftware/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v${LIBLIFTOFF_COMMIT}/downloads/libliftoff-${LIBLIFTOFF_COMMIT}.tar.gz
@@ -33,11 +33,15 @@ fi
S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="BSD-2"
SLOT="0"
-IUSE="avif libei pipewire +sdl +wsi-layer"
+IUSE="avif libei pipewire +sdl systemd +wsi-layer"
+
+# systemd is automagic, but that's unlikely to be an issue in practise. It would
+# be rare for a user to switch from systemd to OpenRC.
RDEPEND="
dev-lang/luajit:2=
- >=dev-libs/wayland-1.23
+ >=dev-libs/libinput-1.14.0:=
+ >=dev-libs/wayland-1.23.1
gui-libs/libdecor
<media-libs/libdisplay-info-0.3:=
media-libs/vulkan-loader
@@ -51,7 +55,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
- x11-libs/libxkbcommon
+ >=x11-libs/libxkbcommon-1.8.0
x11-libs/libXmu
x11-libs/libXrender
x11-libs/libXres
@@ -61,26 +65,26 @@ RDEPEND="
libei? ( dev-libs/libei )
pipewire? ( >=media-video/pipewire-0.3:= )
sdl? ( media-libs/libsdl2[video,vulkan] )
+ systemd? ( sys-apps/systemd:= )
wsi-layer? ( x11-libs/libxcb )
"
# For bundled wlroots.
RDEPEND+="
- >=dev-libs/libinput-1.14.0:=
media-libs/libglvnd
- media-libs/mesa[egl(+),gles2(+)]
+ >=media-libs/mesa-24.1.0_rc1[opengl]
sys-auth/seatd:=
virtual/libudev
x11-base/xwayland
x11-libs/libxcb:=
- >=x11-libs/pixman-0.42.0
+ >=x11-libs/pixman-0.43.0
x11-libs/xcb-util-wm
"
DEPEND="
${RDEPEND}
- >=dev-libs/wayland-protocols-1.34
+ >=dev-libs/wayland-protocols-1.41
>=dev-libs/stb-20240201-r1
dev-util/vulkan-headers
- media-libs/glm
+ >=media-libs/glm-1.0.1
dev-util/spirv-headers
wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
"
@@ -92,6 +96,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-deprecated-stb.patch
+ "${FILESDIR}"/${PN}-subprojects.patch
)
FILECAPS=(
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-06-22 21:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-22 21:32 [gentoo-commits] repo/gentoo:master commit in: gui-wm/gamescope/files/, gui-wm/gamescope/ James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox