[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/

["Sam James" <sam@gentoo.org>]

commit:     c413439b8f12f65d35bbd1ce9a377b7539edd5d2
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sat Apr  2 14:53:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 19:28:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c413439b

games-util/lutris: add patch to chose amdgpu-pro-vulkan driver

GURU amdvlk (orphaned for now) will be detected as the open source version

Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Closes: https://github.com/gentoo/gentoo/pull/24867
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch | 46 ++++++++++++++++++++++
 ..._beta2.ebuild => lutris-0.5.10_beta2-r1.ebuild} |  1 +
 ...ris-0.5.9.1.ebuild => lutris-0.5.9.1-r1.ebuild} |  5 ++-
 games-util/lutris/lutris-9999.ebuild               |  1 +
 4 files changed, 52 insertions(+), 1 deletion(-)

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
+ 
+ 

diff --git a/games-util/lutris/lutris-0.5.10_beta2.ebuild b/games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
similarity index 97%
rename from games-util/lutris/lutris-0.5.10_beta2.ebuild
rename to games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
index aea04d0dd550..f130672bb4a9 100644
--- a/games-util/lutris/lutris-0.5.10_beta2.ebuild
+++ b/games-util/lutris/lutris-0.5.10_beta2-r1.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch"
 	"${FILESDIR}/${P}-fix-install-requires.patch"
 	"${FILESDIR}/${P}-fix-launching-steam.patch"
+	"${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch"
 )
 
 python_test() {

diff --git a/games-util/lutris/lutris-0.5.9.1.ebuild b/games-util/lutris/lutris-0.5.9.1-r1.ebuild
similarity index 93%
rename from games-util/lutris/lutris-0.5.9.1.ebuild
rename to games-util/lutris/lutris-0.5.9.1-r1.ebuild
index 683abd5de58b..06be0ac26a76 100644
--- a/games-util/lutris/lutris-0.5.9.1.ebuild
+++ b/games-util/lutris/lutris-0.5.9.1-r1.ebuild
@@ -58,7 +58,10 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
-PATCHES=( "${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-avoid-gtk-4.0-already-loaded-testerror.patch"
+	"${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch"
+)
 
 python_test() {
 	virtx epytest

diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index fa2c19860a63..1a0b499e7b23 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
+PATCHES=( "${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch" )
 
 python_test() {
 	virtx epytest