From d2ab7a6c18b5a61a6887a7d712162111fb006dcb Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Fri, 2 Dec 2022 19:20:57 +0300
Subject: [PATCH] Scripts version 2147

---
 data_from_portwine/changelog_eng              | 10 +++++++++
 data_from_portwine/changelog_rus              | 10 +++++++++
 data_from_portwine/scripts/functions_helper   | 22 +++++++++++++++++--
 .../scripts/portwine_db/League of Legends     |  2 +-
 data_from_portwine/scripts/var                | 10 ++++-----
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index ffecaa05..6958e17f 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,16 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:
 
+###Scripts version 2147###
+* created a repository https://github.com/Castro-Fidel/vulkan/releases with DXVK and VKD3D versions compiled specifically to work under the container, which reduces problems and increases the number of games launched
+* default versions:
+     export DXVK_STABLE_VER="1.10.3-28"
+     export DXVK_GIT_VER="2.0-26"
+     export VKD3D_STABLE_VER="1.1-2602"
+     export VKD3D_GIT_VER="1.1-2967"
+* you can still set the standard versions of DXVK and VKD3D for individual games and they will be downloaded from off. GitHub repositories
+* solved problem with League of Legends game on some systems (eg Rosa Linux)
+
 ###Scripts version 2146###
 * added interface language switching in the "PORTPROTON SETTINGS" section
 * added the ability to download the new version of PROTON STEAM 7.0-5
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index c07a6246..f84bcce6 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,16 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2147###
+* создан репозиторий https://github.com/Castro-Fidel/vulkan/releases с версиями DXVK и VKD3D скомпилированные специально для работы под контейнером, что уменьшает проблемы у увеличевает количество запускаемых игр 
+* версии по умолчанию:
+    export DXVK_STABLE_VER="1.10.3-28"
+    export DXVK_GIT_VER="2.0-26"
+    export VKD3D_STABLE_VER="1.1-2602"
+    export VKD3D_GIT_VER="1.1-2967"
+* вы всё еще можете выставить для отдельных игр стандартные версии DXVK и VKD3D и они скачаются с офф. репозиториев GitHub
+* решена проблема с игрой League of Legends на некоторых системах (например Rosa Linux)
+
 ###Scripts version 2146###
 * добавлено переключение языка интерфейса в разделе "НАСТРОЙКИ PORTPROTON"
 * добавлена возможность скачивания новой версии PROTON STEAM 7.0-5
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index eefb1dee..514e6d30 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -673,7 +673,16 @@ pw_check_and_download_dxvk_and_vkd3d () {
     for DXVK_VAR_VER in "${DXVK_STABLE_VER}" "${DXVK_GIT_VER}" ; do
         if [ ! -d "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}" ] ; then
             print_info "Download and install DXVK v.${DXVK_VAR_VER}"
-            if try_download "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" ; then
+            if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/dxvk-${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz" ; then
+                if unpack_tar_xz "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}" ; then
+                    try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz"
+                else
+                    try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz"
+                    try_remove_dir dxvk-${DXVK_VAR_VER}
+
+                    zenity_error_download && pw_check_and_download_dxvk_and_vkd3d
+                fi
+            elif try_download "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" ; then
                 if unpack_tar_gz "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}" ; then
                     try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz"
                 else
@@ -692,7 +701,16 @@ pw_check_and_download_dxvk_and_vkd3d () {
     for VKD3D_VAR_VER in "${VKD3D_STABLE_VER}" "${VKD3D_GIT_VER}" ; do
         if [ ! -d "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}" ] ; then
             print_info "Download and install VKD3D-PROTON v.${VKD3D_VAR_VER}"
-            if try_download "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" ; then
+            if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/vkd3d-proton-${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" ; then
+                if unpack_tar_xz "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}" ; then
+                    try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz"
+                else
+                    try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz"
+                    try_remove_dir vkd3d-proton-${VKD3D_VAR_VER}
+
+                    zenity_error_download && pw_check_and_download_dxvk_and_vkd3d
+                fi
+            elif try_download "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" ; then
                 if unpack_tar_zst "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}" ; then
                     try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst"
                 else
diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends
index b8ef693a..c15d675f 100755
--- a/data_from_portwine/scripts/portwine_db/League of Legends	
+++ b/data_from_portwine/scripts/portwine_db/League of Legends	
@@ -21,7 +21,7 @@ export PW_NO_FSYNC=1
 export PW_NO_ESYNC=1
 export PW_DISABLED_CREATE_DB=1
 export PW_USE_D3D_EXTRAS=1
-export DXVK_STABLE_VER="1.10.2"
+export DXVK_STABLE_VER="1.10.3-28"
 ##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI
 
 check_download_wine_ver_for_lol () {
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 2468c1ca..e3e6c0ce 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2146
+#SCRIPTS_NEXT_VERSION=2147
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt
@@ -41,10 +41,10 @@ export PW_GE_VER="7-37"
 export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
 export PW_WINE_FULLSCREEN_FSR="0"
 ###DXVK_AND_VKD3D###
-export DXVK_STABLE_VER="1.10.3"
-export DXVK_GIT_VER="2.0"
-export VKD3D_STABLE_VER="2.6"
-export VKD3D_GIT_VER="2.7"
+export DXVK_STABLE_VER="1.10.3-28"
+export DXVK_GIT_VER="2.0-26"
+export VKD3D_STABLE_VER="1.1-2602"
+export VKD3D_GIT_VER="1.1-2967"
 ###PREFIX_VERSION###
 export DOTPFX_VER="48v1"
 export DEFPFX_VER="v1"