gentoo resync : 12.05.2022

8 files changed, 87 insertions, 68 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index dfa6c5031121..3fab7667043f 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/libstrangle/Manifest b/games-util/libstrangle/Manifest
new file mode 100644
index 000000000000..696f10552731
--- /dev/null
+++ b/games-util/libstrangle/Manifest
@@ -0,0 +1,3 @@
+DIST libstrangle-0.1.1_p20220222.tar.gz 947358 BLAKE2B 2222550e28d4af1dafc43691f3021fdac30445e3223673b74f69adfe681c9b1879925b3961dc9d086f2e5cadeeca7488e1a53bcdb6e302b2e4087a0f2a19a380 SHA512 5f6d7bc5acb95be4c0083a16134dfe7c6a95ab6a73cca69ec2d92cf75ebf5ecfaea08dda0d887e8e136fd410c988c0bd36289c2a17df3eb1698b453bb38c4011
+EBUILD libstrangle-0.1.1_p20220222.ebuild 1738 BLAKE2B 96016bfee57d1add6e500572d82bc6ca34cc84360ccca795b192e62659b82f728d1cdf121213c2d76d6c80807d82e9070c9cf2649a3bdc3be007f3889996a052 SHA512 9868640ab100395db2bf7dc3edf63464059dc739f351accd2557c48da8e3ba082ad83f6426226e3a0d18ae5b9d4f53f3a9b3d4cdc2d25c204c211633446a3306
+MISC metadata.xml 332 BLAKE2B e75edf673556ac4f9fa191394e3984305272379efc2ca67149029dd037a16ea8679081ccde536648e57e61d7fc4cdeab7dd946dfc4dfe2222f9ca777636ae2b8 SHA512 2cd2bdaef93867ff657b5b752e548e74a43663549b02fe71ce0cef61662ed3a69b6d49e90f912486080e266308391f1b93a910ccf18879dd39e563a3327eb095
diff --git a/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild b/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
new file mode 100644
index 000000000000..1ecf01f317d3
--- /dev/null
+++ b/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib multilib-minimal toolchain-funcs
+
+STRANGLE_COMMIT="0273e318e3b0cc759155db8729ad74266b74cb9b"
+
+DESCRIPTION="Frame rate limiter for OpenGL/Vulkan"
+HOMEPAGE="https://gitlab.com/torkel104/libstrangle/"
+SRC_URI="https://gitlab.com/torkel104/libstrangle/-/archive/${STRANGLE_COMMIT}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${STRANGLE_COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Note: requires a glibc version with DT_HASH fix or split libdl.so.
+# For the latter, <glibc-2.34 is acceptable but skip so portage
+# doesn't suggest downgrading to stable users.
+# https://gitlab.com/torkel104/libstrangle/-/issues/59
+# (cleanup these after fixed glibc is stable for some time)
+RDEPEND="
+	sys-apps/grep[pcre]
+	elibc_glibc? (
+		|| (
+			>=sys-libs/glibc-2.35-r4
+			(
+				>=sys-libs/glibc-2.34-r12
+				<sys-libs/glibc-2.35
+			)
+		)
+	)"
+DEPEND="
+	media-libs/libglvnd
+	dev-util/vulkan-headers"
+
+QA_SONAME="usr/lib.*/libstrangle.*" # intended for dlopen()
+
+src_prepare() {
+	default
+
+	sed -ri '/^C(XX)?FLAGS=/s|=|+=$(CPPFLAGS) |' makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD{,XX}FLAGS="${LDFLAGS}" native
+}
+
+multilib_src_install() {
+	local emakeargs=(
+		DESTDIR="${D}"
+		prefix="${EPREFIX}"/usr
+		libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	emake "${emakeargs[@]}" install-native
+}
+
+multilib_src_install_all() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install-common
+	einstalldocs
+}
+
+pkg_postinst() {
+	has_multilib_profile && use amd64 && use !abi_x86_32 &&
+		ewarn "Note that USE=abi_x86_32 is needed for 32bit games (common with steam / wine)"
+}
diff --git a/games-util/libstrangle/metadata.xml b/games-util/libstrangle/metadata.xml
new file mode 100644
index 000000000000..1af7db338edf
--- /dev/null
+++ b/games-util/libstrangle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">torkel104/libstrangle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index bec76f673539..f445a96461b8 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,6 +1,4 @@
-AUX lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch 1600 BLAKE2B 35e787a098778c65fc8dfa342a767f82fc70b49d99cc7570d69e028c0edbdef9da0ec4ec198b82de66c7326c4afccf9aa2d5e67c28dcab47cc276cc7f68e747f SHA512 41777ecce57dce2e1861a548381857d2fe28e031a682ac3188d0b12ba65b8b6f67390dc27b18197a8e650abc6f0f5fbddd2d3dec1185ea92264a5b09f6c2afaa
-AUX lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch 307 BLAKE2B fe4f822b99f1f76ab62a669e9108b0dd724503fdbf4b26fa8f67f63da8d8cbd17a56aca18b373053c87a93603f90c99c252e213c30f133789a11b2ef2d72dcdd SHA512 f97100f240165e28bd26a0fb68125252fd4d02a8d1e5d71875aa4ab8583c835dcd15eedaf60f5b0873013bd1dd3b71f46282a008e432fb56efde7049cfe587c3
-DIST lutris_0.5.10.tar.xz 1225880 BLAKE2B bd46531695860c60a4b94c7bc1f4366bb6f5a9d4a098e0eff69f85e9edee0d551b6f55276a4ae48fb28e75a706da526dfaf7fbcf17af8ebbee6e809f6f39825f SHA512 cb77afe40f1ceb053edf8aaa4f97fd44f0c8ecc33450a16b83373408807891d99bd409cf26d98543a0789a5dc38475d584790de1d48e0e56762945a7b6ca63e3
-EBUILD lutris-0.5.10.ebuild 2342 BLAKE2B 51c13baa1ec2d586b9297cf1dca217c981c9d0a5a7b5e2fb24b645b51c3c65797371b70adef16956a6101f7830d4c5e52b5b75379a825084b30f3cb921b09500 SHA512 c2e107946fd8c2eeee0ad5f88d42051024ebb2e3c12f499670cb06abdddbd9e02cc79d2719660d7c3e460ea20dc40886009b2771862d122a99e09f6e98c27556
+DIST lutris_0.5.10.1.tar.xz 1230464 BLAKE2B 5ba913f5e37956344b59c47c1315cf277ce57b1b771279c8aa4243971ea9f0c5277ad19b18655731048e989f752d957216d055ac6c26bb8731e52b4345d30847 SHA512 f6443fa86d0b38e1b5ba51054e50776eea63d9adda5738a7e69f2fe6b196f99491894d5068d6cddfd35d1baafa4188bd1935598b84266e9e23bd1b58c16dde20
+EBUILD lutris-0.5.10.1.ebuild 2190 BLAKE2B 88c9b4c3d4f0fe06ad4c310d90934ad3fa9a0ab3562f3d233a23f1969a6ca9a7fe7254ec91e984ed1ffc08538157f782947e457d0426e8e9612222b4b4221aaf SHA512 7f251210aec54ea1f3f3708cb2f2caa32e7a866bb4739a24c30d0ee6e7655ff5b1f583d42ba7a2367f2db34af770cf07f99390cd88a4d18a3987f35b78493522
 EBUILD lutris-9999.ebuild 1960 BLAKE2B a47f2bfdb7364ce9c1d0ffe1236c6995b67cbb5d84ef472d7fa059302ad05c5063f0928f9accd05608819ef3d668ec35f2742a2a9c269a8bfd33da78f904aef3 SHA512 cf9576152e735e5fc28cb26dadd0da4e970cee4fbaa6404982e373382fd3a2cb8dcfb0ed9da05fccbee16edf765e5f0aa4d7ff6802c1641500d1a1ec3041243c
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch b/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
deleted file mode 100644
index 5ff491486d5a..000000000000
--- a/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/lutris/sysoptions.py b/lutris/sysoptions.py
-index 8896b7d..565bbab 100644
---- a/lutris/sysoptions.py
-+++ b/lutris/sysoptions.py
-@@ -82,6 +82,7 @@ def get_vk_icd_choices():
-     amdradv = []
-     nvidia = []
-     amdvlk = []
-+    amdvlkpro = []
-     choices = [(_("Auto: WARNING -- No Vulkan Loader detected!"), "")]
-     icd_files = defaultdict(list)
-     # Add loaders
-@@ -96,13 +97,17 @@ def get_vk_icd_choices():
-                 amdradv.append(loader)
-             elif "nvidia" in loader:
-                 nvidia.append(loader)
--            elif "amd_icd" in loader:
--                amdvlk.append(loader)
-+            elif "amd" in loader:
-+                if "pro" in loader:
-+                    amdvlkpro.append(loader)
-+                else:
-+                    amdvlk.append(loader)
- 
-     intel_files = ":".join(intel)
-     amdradv_files = ":".join(amdradv)
-     nvidia_files = ":".join(nvidia)
-     amdvlk_files = ":".join(amdvlk)
-+    amdvlkpro_files = ":".join(amdvlkpro)
- 
-     glxinfocmd = get_gpu_vendor_cmd(0)
-     if nvidia_files:
-@@ -125,7 +130,12 @@ def get_vk_icd_choices():
-     if nvidia_files:
-         choices.append(("Nvidia Proprietary", nvidia_files))
-     if amdvlk_files:
--        choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
-+        if not amdvlkpro_files:
-+            choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
-+        else:
-+            choices.append(("AMDVLK Open source", amdvlk_files))
-+    if amdvlkpro_files:
-+        choices.append(("AMDGPU-PRO Proprietary", amdvlkpro_files))
-     return choices
- 
- 
diff --git a/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch b/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch
deleted file mode 100644
index 8c0d366926b7..000000000000
--- a/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lutris/util/test_config.py b/lutris/util/test_config.py
-index b3feb87..01b9294 100644
---- a/lutris/util/test_config.py
-+++ b/lutris/util/test_config.py
-@@ -1,5 +1,8 @@
- import os
- 
-+import gi
-+gi.require_version('Gtk', '3.0')
-+
- from lutris import startup
- from lutris.database import schema
- 
diff --git a/games-util/lutris/lutris-0.5.10.ebuild b/games-util/lutris/lutris-0.5.10.1.ebuild
index ba883a7fe92a..f9735e9f61e4 100644
--- a/games-util/lutris/lutris-0.5.10.ebuild
+++ b/games-util/lutris/lutris-0.5.10.1.ebuild
@@ -59,11 +59,6 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch"
-	"${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch"
-)
-
 python_test() {
 	virtx epytest
 }