Scripts version 2193

2023-05-30 19:42:45 +03:00
parent e26cc989b4
commit 89f282ef7f
5 changed files with 45 additions and 31 deletions
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,11 +2,19 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:

+###Scripts version 2193###
+Date: 30.05.2023 / The size of the downloaded update: 15 megabytes.
+* a small change in the settings of 3D api, DXR, DXS.
+* updated dxvk-nvapi to version 0.6.3
+* updated FAKE_DLS 230506 (FidelityFx Super Resolution 2.2-3001-0-9-1683395145)
+
 ###Scripts version 2192###
+Date: 30.05.2023 / The size of the downloaded update: 9 megabytes.
 * fixed interface window when changing its size
 * HOTFIX - transition on the way to .exe file

 ###Scripts version 2191###
+Date: 29.05.2023 / The size of the downloaded update: 450 megabytes.
 * the libs_v43 library package has been updated
    pressure-vessel 0.20230418.0 
    sniper 0.20230424.48416
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,11 +2,19 @@
 -----------------------------------------
 История изменений:

+###Scripts version 2193###
+Дата: 30.05.2023 / Размер скачиваемого обновления: 15 мегабайт.
+* обновление функций выбора 3D api, DXR, DLSS, FAKE_DLSS
+* обновлен dxvk-nvapi до версии 0.6.3
+* обновлен FAKE_DLSS 230506 (FidelityFx Super Resolution 2.2-3001-0-9-1683395145)
+
 ###Scripts version 2192###
+Дата: 30.05.2023 / Размер скачиваемого обновления: 9 мегабайт.
 * исправлено "убегание" окна интерфейса при изменении его размера
 * HOTFIX - переход по пути до .exe файла

 ###Scripts version 2191###
+Дата: 29.05.2023 / Размер скачиваемого обновления: 450 мегабайт.
 * обновлен пакет библиотек libs_v43
    pressure-vessel	0.20230418.0	
    sniper	0.20230424.48416
--- a/data_from_portwine/scripts/credits
+++ b/data_from_portwine/scripts/credits
@@ -317,12 +317,8 @@ VK:       https://vk.com/linuxgamingru
 -------------------------------------------
 Стать платным подписчиком:
 boosty: https://boosty.to/portwine-linux.ru
-patreon: https://www.patreon.com/portproton
-Кошельки WebMoney:   WMZ-Z135951244401   WME-E325631629973
 Yandex кошелек:   410012267513818
-------------------------------------------
-Задонатить на стрим:
-https://www.donationalerts.com/r/portwine_linux" &
+-------------------------------------------" &

 "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
 --fontname="Serif bold italic 10" --text-info <<< "                   Сторонние библиотеки, которые используются в PortProton
@@ -651,16 +647,12 @@ SOFTWARE." &
 --text-info --scroll <<< \
 "Website:  http://linux-gaming.ru
 Discord:  http://discord.gg/yJSEFjF
-VK:       https://vk.com/portwinelinux
+VK:       https://vk.com/linuxgamingru
 -------------------------------------------
 Become a paid subscriber:
 boosty:  https://boosty.to/portwine-linux.ru
-patreon: https://www.patreon.com/portproton
-WebMoney wallets:   WMZ-Z135951244401   WME-E325631629973
 Yandex wallet:   410012267513818
-------------------------------------------
-Donat on stream:
-https://www.donationalerts.com/r/portwine_linux" &
+-------------------------------------------" &

 "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \
 --fontname="Serif bold italic 10" --text-info <<< "                               Third-party libraries that are used in PortProton
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -126,30 +126,35 @@ start_portwine () {
    if ! try_force_link_file "${WINEDIR}/lib64/wine/nvapi/nvapi64.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" ; then
        try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x64/nvapi64.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" 
    fi
-    try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/nvml.dll"
-    try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib64/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvml.dll"

-    if [[ ! -z "${PW_USE_FAKE_DLSS}" && "${PW_USE_FAKE_DLSS}" == 1 && -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]]
-    then
+    try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/nvml.dll"
+    try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvml.dll"
+    try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.ini"
+    try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.dll"
+    try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/_nvngx.dll"
+    if [[ "${PW_USE_FAKE_DLSS}" == 1 ]] && [[ -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]] ; then
        try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" 
        try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
        enabled_fake_nvidia_videocard 1
-        export DXVK_ENABLE_NVAPI=1
+        var_winedlloverride_update "nvngx=n;_nvngx="
+        export DXVK_ENABLE_NVAPI=0
        export WINE_HIDE_NVIDIA_GPU=0
-    elif [[ ! -z "${PW_USE_NVAPI_AND_DLSS}" && "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] && [[ -d "${WINEDIR}/lib/wine/nvapi/" ]]
-    then
-        try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.ini"
-        if [[ ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvngx.dll" || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/_nvngx.dll" ]] ; then
-            try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
-            try_copy_file `find /usr/* -type f -name "_nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"       
-        fi
+    elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] && [[ -d "${WINEDIR}/lib/wine/nvapi/" ]] ; then
+        try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+        try_copy_file `find /usr/* -type f -name "_nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"       
        enabled_fake_nvidia_videocard 1
        export DXVK_ENABLE_NVAPI=1
        export WINE_HIDE_NVIDIA_GPU=0
    else
        enabled_fake_nvidia_videocard 0
        export DXVK_ENABLE_NVAPI=0
-        export WINE_HIDE_NVIDIA_GPU=1
+        var_winedlloverride_update "nvngx,_nvngx="
+    fi
+
+    grep '"renderer"=' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" 
+    if [[ "$?" == 0 ]] ; then
+        sed -i /'"renderer"='/d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg"
+        sed -i /'renderer='/d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"
    fi

    if [[ ! -z "${PW_PRIME_RENDER_OFFLOAD}" && "${PW_PRIME_RENDER_OFFLOAD}" != 0 ]] ; then
@@ -170,14 +175,14 @@ start_portwine () {
    fi
    
    [[ ! -z "${PW_MANGOHUD_USER_CONF}" && "${PW_MANGOHUD_USER_CONF}" != 0 ]] && unset MANGOHUD_CONFIG
+
    if [[ "${PW_USE_DXR11}" == 1 ]] || [[ "${PW_USE_DXR10}" == 1 ]] || [[ "${PW_USE_RAY_TRACING}" == 1 ]]; then
-        var_vkd3d_config_update dxr11
-        var_radv_perftest_config_update rt
+        var_vkd3d_config_update dxr
+        var_radv_perftest_config_update rt,gpl
        export VKD3D_FEATURE_LEVEL="12_1"
-        export DXVK_ENABLE_NVAPI=1
        export WINE_HIDE_NVIDIA_GPU=0
+        export DXVK_ENABLE_NVAPI=1
    fi
-    export optirun_on=""

    case "$PW_FORCE_USE_VSYNC" in  # 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
        "0")
--- 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=2192
+#SCRIPTS_NEXT_VERSION=2193
 ########################################################################
 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
@@ -33,8 +33,8 @@ export PW_MANGOHUD_x32="0"
 export PW_USE_EAC_AND_BE="1"
 ###DEFAULT_WINE###
 export PW_WINE_USE="PROTON_LG"
-export PW_PLUGINS_VER="_v10"
-export PW_FAKE_DLSS_VER="091122"
+export PW_PLUGINS_VER="_v11"
+export PW_FAKE_DLSS_VER="230506"
 ###WINE_PROTON_LG###
 export PW_LG_VER="7-54"
 export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}"
@@ -55,6 +55,7 @@ export DEFPFX_VER="v1"
 export PROGPFX_VER="v1"
 export PW_MUST_WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b,winemenubuilder.exe="
 #################################################################
+export optirun_on=""
 export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf"
 #################################################################
 pw_install_dll_in_prefix ()