From d0fafa709f2b77dc0e70c99118520000965e4b5a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Mar 2024 17:43:01 +0000 Subject: gentoo auto-resync : 04:03:2024 - 17:43:01 --- gui-wm/Manifest.gz | Bin 1207 -> 1206 bytes gui-wm/gamescope/Manifest | 3 +- .../files/gamescope-3.14.0-deprecated-stb.patch | 22 +++++ gui-wm/gamescope/gamescope-3.14.0-r1.ebuild | 99 +++++++++++++++++++++ gui-wm/gamescope/gamescope-3.14.0.ebuild | 97 -------------------- 5 files changed, 123 insertions(+), 98 deletions(-) create mode 100644 gui-wm/gamescope/files/gamescope-3.14.0-deprecated-stb.patch create mode 100644 gui-wm/gamescope/gamescope-3.14.0-r1.ebuild delete mode 100644 gui-wm/gamescope/gamescope-3.14.0.ebuild (limited to 'gui-wm') diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz index 0fa7cdda0418..529a9b47ba74 100644 Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest index 4f8270c394ac..17f0a6f2eac3 100644 --- a/gui-wm/gamescope/Manifest +++ b/gui-wm/gamescope/Manifest @@ -1,4 +1,5 @@ +AUX gamescope-3.14.0-deprecated-stb.patch 634 BLAKE2B 33bd10dc41f9fdbbec12ea0bdec1cf8af8fc9bc499324f5f2f329c72273109fd82495a0f3d3ffb2954ee91eb106f7e36479716af6e8d2cfd76ef58c9074003d3 SHA512 56aceec2552868749a21c9ca06ac6b41da3bd901692b376e5691155c58861f941dbd5359f1e22bbe54fd14e061cd586fe06d0109a8a45a0ecf6049ea3a79663b DIST gamescope-3.14.0.tar.gz 474625 BLAKE2B 4065cf0957bd6e68eb31eff20ccfae3bb3a599f7398b97411c4bea3734fbf555e5d2326de434d1faf437571ec162f4e5d270ef7b48f23e3ca6806f2dac1703c5 SHA512 b2bcd9a4154db6380d29e9f3536ca73ed3e09d589c6446f80f373674dfa3cbb4b9b77ccb82209cc68258fc0f887bb15ebf479acc7091d14073a1c2bd65632d00 DIST reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz 1543894 BLAKE2B 5e2b643ffbbda3ad078deb075a6fada1d0a560c6d865b7febee6a8eaade83ec90db3c5a8f4130d27b6dfaa8ee7b899edd214c23c947678eed28fb8e7165d9bd2 SHA512 4565d094e1c2d53d5073b4976874665d38dcf7ca86e982e569cc76923eaa9187fa32a4385fc577a3a867d2917596e6377e5a023a34bc2d389ff899d5b69764fb -EBUILD gamescope-3.14.0.ebuild 2634 BLAKE2B c7ed484bb9038f66dda2bf720290fb7ade546c2235bc38202ebf3c30b05bd4b39e85f6f951fa92d7aba162efeaa21af8630566c30ba920d20a5c712e424a70a9 SHA512 e8b213ac3f68a40384b10c790e983f4e19aa3e21182af6f35d25a8e85b1d7e64c5e2cd5366a60c31def272f587699ed5f63e3bd606717d2fd218b4b9cae5ddbf +EBUILD gamescope-3.14.0-r1.ebuild 2691 BLAKE2B 206d6f56bca3345f2cf06483f6efae4f8ebc4fab9c858aebb7ae48271d37b488ca10115a84fbd722d8e006bb956c179bcead3774c8e7e79917ff115f695ab5db SHA512 5a874cbcf7c10e2981afb65992fb37d36db6331ecfe09566a0cc775bde099464de8d1c48daf315ac7e8ce6ca136f8e31a5896f2001ccfbfec7f9ddd240b7a422 MISC metadata.xml 489 BLAKE2B 6930da0ca2827741a902e064b3bca71266ac5c2e61d7cf6d566c37e971efd04b2fcd2381659e1d5babe6fd05dd4d06979c0d82b3ac5e2702bb5d3311ef30df79 SHA512 419f4a3f3dc7a940d0f157323b9afd116b4a4d2efc718eb5979d84677b770a606c532d0777dbed1b6598afa393894e5dc9982dbaf7e31c90a9e0b433938d4e55 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 + #define STB_IMAGE_RESIZE_IMPLEMENTATION +-#include ++#include + + #include + #include +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -108,7 +108,7 @@ static const int g_nBaseCursorScale = 36; + #define STB_IMAGE_WRITE_IMPLEMENTATION + #include + #include +-#include ++#include + + #define GPUVIS_TRACE_IMPLEMENTATION + #include "gpuvis_trace_utils.h" diff --git a/gui-wm/gamescope/gamescope-3.14.0-r1.ebuild b/gui-wm/gamescope/gamescope-3.14.0-r1.ebuild new file mode 100644 index 000000000000..bacc3a1b2891 --- /dev/null +++ b/gui-wm/gamescope/gamescope-3.14.0-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps meson + +RESHADE_COMMIT="9fdbea6892f9959fdc18095d035976c574b268b7" +MY_PV=$(ver_rs 3 -) +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" +LICENSE="BSD-2" +SLOT="0" +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 + media-libs/libsdl2[video,vulkan] + media-libs/vulkan-loader + sys-apps/hwdata + sys-libs/libcap + >=x11-libs/libdrm-2.4.109 + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbcommon + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXres + x11-libs/libXtst + x11-libs/libXxf86vm + pipewire? ( >=media-video/pipewire-0.3:= ) + wsi-layer? ( x11-libs/libxcb ) +" +DEPEND=" + ${RDEPEND} + >=dev-libs/stb-20240201-r1 + dev-util/vulkan-headers + =media-libs/vkroots-0_p20231108 ) +" +BDEPEND=" + dev-util/glslang + dev-util/wayland-scanner + virtual/pkgconfig +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +PATCHES=( "${FILESDIR}/${P}-deprecated-stb.patch" ) + +FILECAPS=( + cap_sys_nice usr/bin/${PN} +) + +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 + ln -snfT ../../reshade-${RESHADE_COMMIT} src/reshade || die + + # 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 + ln -snf "${ESYSROOT}"/usr/include/spirv thirdparty/SPIRV-Headers/include/ || die +} + +src_configure() { + local emesonargs=( + --force-fallback-for= + -Dbenchmark=disabled + -Denable_openvr_support=false + $(meson_feature pipewire) + $(meson_use wsi-layer enable_gamescope_wsi_layer) + ) + meson_src_configure +} diff --git a/gui-wm/gamescope/gamescope-3.14.0.ebuild b/gui-wm/gamescope/gamescope-3.14.0.ebuild deleted file mode 100644 index 1d1283d27766..000000000000 --- a/gui-wm/gamescope/gamescope-3.14.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fcaps meson - -RESHADE_COMMIT="9fdbea6892f9959fdc18095d035976c574b268b7" -MY_PV=$(ver_rs 3 -) -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" -LICENSE="BSD-2" -SLOT="0" -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 - media-libs/libsdl2[video,vulkan] - media-libs/vulkan-loader - sys-apps/hwdata - sys-libs/libcap - >=x11-libs/libdrm-2.4.109 - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libXmu - x11-libs/libXrender - x11-libs/libXres - x11-libs/libXtst - x11-libs/libXxf86vm - pipewire? ( >=media-video/pipewire-0.3:= ) - wsi-layer? ( x11-libs/libxcb ) -" -DEPEND=" - ${RDEPEND} - =media-libs/vkroots-0_p20231108 ) -" -BDEPEND=" - dev-util/glslang - dev-util/wayland-scanner - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -FILECAPS=( - cap_sys_nice usr/bin/${PN} -) - -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 - ln -snfT ../../reshade-${RESHADE_COMMIT} src/reshade || die - - # 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 - ln -snf "${ESYSROOT}"/usr/include/spirv thirdparty/SPIRV-Headers/include/ || die -} - -src_configure() { - local emesonargs=( - --force-fallback-for= - -Dbenchmark=disabled - -Denable_openvr_support=false - $(meson_feature pipewire) - $(meson_use wsi-layer enable_gamescope_wsi_layer) - ) - meson_src_configure -} -- cgit v1.2.3