gentoo resync : 16.04.2022

3 files changed, 46 insertions, 35 deletions

diff --git a/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch b/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
deleted file mode 100644
index 8a61d987cece..000000000000
--- a/games-util/lutris/files/lutris-0.5.10_beta2-fix-install-requires.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0388119..51bc8e1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -57,7 +57,7 @@ setup(
-         'evdev',
-         'requests',
-         'python-magic',
--        "distro>=1.7.0;platform_system='Linux'",
-+        'distro>=1.7.0',
-         'lxml'
-     ],
-     url='https://lutris.net',
diff --git a/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch b/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
deleted file mode 100644
index 2edd6569ce75..000000000000
--- a/games-util/lutris/files/lutris-0.5.10_beta2-fix-launching-steam.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 072e72a4aefd91101b79dd05d8ce9f100a4b6b0c Mon Sep 17 00:00:00 2001
-From: Mathieu Comandon <strycore@gmail.com>
-Date: Fri, 25 Feb 2022 14:02:12 -0800
-Subject: [PATCH] contentstatsid key might not be present
-
----
- lutris/util/steam/config.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lutris/util/steam/config.py b/lutris/util/steam/config.py
-index 237cb36f24..bae2ec22da 100644
---- a/lutris/util/steam/config.py
-+++ b/lutris/util/steam/config.py
-@@ -158,7 +158,7 @@ def get_entry_case_insensitive(library_dict, path):
-     with open(library_filename, "r", encoding='utf-8') as steam_library_file:
-         library = vdf_parse(steam_library_file, {})
-         # The contentstatsid key is unused and causes problems when looking for library paths.
--        library["libraryfolders"].pop("contentstatsid")
-+        library["libraryfolders"].pop("contentstatsid", None)
-     try:
-         return get_entry_case_insensitive(library, ["libraryfolders"])
-     except KeyError as ex:
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
new file mode 100644
index 000000000000..5ff491486d5a
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
@@ -0,0 +1,46 @@
+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
+ 
+