From 866bda3e0c8c4663b3064ea4a443812d41f5d70a Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sat, 13 May 2023 11:36:02 +0300
Subject: [PATCH] Scripts version 2182

---
 data_from_portwine/changelog_eng  |  7 +++++++
 data_from_portwine/changelog_rus  |  6 ++++++
 data_from_portwine/scripts/runlib | 28 +---------------------------
 data_from_portwine/scripts/var    |  8 ++++----
 4 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index f03e38e9..9cbcab6a 100755
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,6 +2,13 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:
 
+###Scripts version 2181###
+* updated versions:
+    PROTON_GE="8-3"
+    DXVK_GIT_VER="2.1-85"
+    VKD3D_GIT_VER="1.1-3413"
+* удалена устаревшая функция определения видеокарты от NVIDIA
+
 ###Scripts version 2181###
 * updated versions:
     PROTON_GE="8-2"
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 933b7b14..c8a92ad2 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,12 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2182###
+* обновлены версии:
+    PROTON_GE="8-3"
+    DXVK_GIT_VER="2.1-85"
+    VKD3D_GIT_VER="1.1-3413"
+
 ###Scripts version 2181###
 * обновлены версии:
     PROTON_GE="8-2"
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 40cc7e2e..a4611bb0 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -183,30 +183,7 @@ start_portwine () {
         export VKD3D_FEATURE_LEVEL=12_1
     fi
     export optirun_on=""
-    export check_optimus_manager=
-    export PW_NVIDIA="$(lspci | grep NVIDIA)"
-    if [ -x "`which optimus-manager 2>/dev/null`" ]; then
-        export check_optimus_manager=`optimus-manager --status | grep Current | cut -f 2 -d':' | sed -e 's/^[[:space:]]*//'`
-    fi
-    if [[ ! -z "${PW_NVIDIA}" ]] && [[ "${check_optimus_manager}" != "intel" ]] && [[ "${DRI_PRIME}" != 1 ]] ; then
-        if [ "${check_optimus_manager}" = "nvidia" ]; then
-            check_nvidia_vk_icd_file
-        elif [ -x "`which primusrun 2>/dev/null`" ]; then
-            export optirun_on="primusrun"
-            check_nvidia_vk_icd_file
-        elif [ -x "`which optirun 2>/dev/null`" ]; then
-            export optirun_on="optirun -b primus"
-            check_nvidia_vk_icd_file
-        elif [ -x "`which prime-run 2>/dev/null`" ]; then
-            export optirun_on="prime-run"
-            check_nvidia_vk_icd_file
-        elif [[ -x "`which nvidia-settings 2>/dev/null`" ]] ; then 
-            export __GLX_VENDOR_LIBRARY_NAME=nvidia
-            check_nvidia_vk_icd_file
-        fi
-    else
-        export DRI_PRIME=1
-    fi
+
     case "$PW_FORCE_USE_VSYNC" in  # 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
         "0")
         unset vblank_mode
@@ -345,9 +322,6 @@ start_portwine () {
     fi
     var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;lsteamclient,winemenubuilder=d"
 
-    # export TOTAL_VRAM=`"${PW_WINELIB}/runtime/files/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'`
-    # echo "TOTAL_VRAM=${TOTAL_VRAM}"
-
     echo "Try link wine DXGI by default..."
     if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll"
     then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/dxgi.dll"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index d67786a3..ffcd9bf0 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=2181
+#SCRIPTS_NEXT_VERSION=2182
 ########################################################################
 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
@@ -39,14 +39,14 @@ export PW_FAKE_DLSS_VER="091122"
 export PW_LG_VER="7-54"
 export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}"
 ###WINE_PROTON_GE###
-export PW_GE_VER="8-2"
+export PW_GE_VER="8-3"
 export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
 export PW_WINE_FULLSCREEN_FSR="1"
 ###DXVK_AND_VKD3D###
 export DXVK_STABLE_VER="1.10.3-28"
-export DXVK_GIT_VER="2.1-79"
+export DXVK_GIT_VER="2.1-85"
 export VKD3D_STABLE_VER="1.1-2602"
-export VKD3D_GIT_VER="1.1-3410"
+export VKD3D_GIT_VER="1.1-3413"
 ###PREFIX_VERSION###
 export DOTPFX_VER="48v1"
 export DEFPFX_VER="v1"