STABLE: Scripts version 2435

data_from_portwine/changelog_en

@@ -2,6 +2,14 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2435### / stable / Date: 23.07.2025 / Download update size: 380 megabytes
+* cumulative update of stable version of PortProton scripts
+* removed tab for downloading third-party versions of WINE-GE-GUSTOM (outdated versions of WINE)
+
+###Scripts version 2434### / Date: 22.07.2025 / Download update size: 4 megabytes
+* fixed detection of NVIDIA RTX video cards and automatic enabling of NVAPI and Ray Tracing
+* fixed DLSS on NVIDIA RTX video cards (requires resetting PP settings for the game)
+
 ###Scripts version 2433### / Date: 21.07.2025 / Download update size: 4 megabytes
 * fixed Epic Games Launcher (requires restarting autoinstallation)
 * added convenient (not inverse) logic for enabling ESYNC, FSYNC and NTSYNC

data_from_portwine/changelog_ru

@@ -2,6 +2,14 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2435### / stable / Дата: 23.07.2025 / Размер скачиваемого обновления: 380 мегабайт
+* кумулятивное обновление стабильной версии скриптов PortProton
+* удалена вкладка скачивания сторонних версий WINE-GE-GUSTOM (устаревшие версии WINE)
+
+###Scripts version 2434### / Дата: 22.07.2025 / Размер скачиваемого обновления: 4 мегабайта
+* исправлено определение видеокарт NVIDIA RTX и автоматическое включение NVAPI и Ray Tracing
+* исправлена работа DLSS на видеокартах NVIDIA RTX (требуется сброс настроек PP для игры)
+
 ###Scripts version 2433### / Дата: 21.07.2025 / Размер скачиваемого обновления: 4 мегабайта
 * исправлена работа Epic Games Launcher (требуется повторный запуск автоустановки)
 * добавлена удобная (не инверсивная) логика включения ESYNC, FSYNC и NTSYNC

data_from_portwine/scripts/functions_helper

@@ -2368,25 +2368,12 @@ check_dirs_and_files_in_pfx () {
         done
     }
 
-check_nvidia_rtx () {
-    if [[ "$LSPCI_VGA" == *nvidia* ]] ; then
-        if [[ "$LSPCI_VGA" == *G[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *GT[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *MCP[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *GF[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *GK[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *GM[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *GP[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *GV[0-9]* ]] \
-        || [[ "$LSPCI_VGA" == *TU11[6-7]* ]]
-        then return 1
-        else return 0
-        fi
-    fi
-    return 1
-}
-
 pw_init_db () {
+    if echo "$LSPCI_VGA" | grep -i -q 'nvidia.*rtx' ; then
+        export PW_USE_NVAPI_AND_DLSS="1"
+        export PW_USE_RAY_TRACING="1"
+    fi
+
     if [[ -f "${portwine_exe}" ]] ; then
         PORTWINE_DB="$(basename "${portwine_exe%.[Ee][Xx][Ee]}")"
         export PORTWINE_DB
@@ -2866,21 +2853,16 @@ pw_skip_get_info () {
         fi
 
         if [[ -f "${PW_TMPFS_PATH}/lspci.tmp" ]] ; then
-            LSPCI_VGA="$(grep -e 'VGA|3D' "${PW_TMPFS_PATH}/lspci.tmp" | tr -d '\n')"
+            LSPCI_VGA="$(grep -E 'VGA|3D' "${PW_TMPFS_PATH}/lspci.tmp" | tr -d '\n')"
             export LSPCI_VGA
         fi
 
-        # TODO: Add NVIDIA Smooth Motion
-        if check_nvidia_rtx ; then
-            check_variables PW_USE_NVAPI_AND_DLSS "1"
-            check_variables PW_USE_RAY_TRACING "1"
-        fi
-
         if [[ -f "${PW_TMPFS_PATH}/xrandr.tmp" ]] ; then
             PW_SCREEN_RESOLUTION="$(<"${PW_TMPFS_PATH}/xrandr.tmp" sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')"
             PW_SCREEN_PRIMARY="$(grep -e 'primary' "${PW_TMPFS_PATH}/xrandr.tmp" | awk '{print $1}')"
-            export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION
         fi
+        [[ $PW_SCREEN_RESOLUTION != *x* ]] && PW_SCREEN_RESOLUTION="1920x1080"
+        export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION
 
         if [[ -f "${PW_TMPFS_PATH}/locale.tmp" ]] ; then
             GET_LOCALE_LIST="ru_RU.utf en_US.utf zh_CN.utf ja_JP.utf ko_KR.utf"
@@ -3432,7 +3414,6 @@ start_portwine () {
                     -e /'dxgi.customDeviceDesc =/c # dxgi.customDeviceDesc =' \
                     -e /'dxgi.customDeviceId =/c # dxgi.customDeviceId =' \
                     -e /'dxgi.customVendorId =/c # dxgi.customVendorId =' \
-                    -e /'dxgi.hideAmdGpu =/c # dxgi.hideAmdGpu =' \
                     -e /'dxgi.hideNvidiaGpu =/c # dxgi.hideNvidiaGpu =' \
                     -e /'d3d11.cachedDynamicResources =/c # d3d11.cachedDynamicResources =' \
                     -e /'dxgi.maxFrameLatency =/c # dxgi.maxFrameLatency =' \
@@ -3445,15 +3426,9 @@ start_portwine () {
                     -e /'d3d9.countLosableResources =/c # d3d9.countLosableResources =' \
                 "${DXVK_CONFIG_FILE}"
 
-                unset WINE_HIDE_NVIDIA_GPU WINE_HIDE_AMD_GPU WINEHAGS
+                export WINE_HIDE_NVIDIA_GPU="0"
-                unset DXVK_NVAPI_DRIVER_VERSION DXVK_NVAPI_ALLOW_OTHER_DRIVERS
+                export WINE_HIDE_AMD_GPU="0"
-                ;;
+                unset DXVK_NVAPI_DRIVER_VERSION DXVK_NVAPI_ALLOW_OTHER_DRIVERS WINEHAGS
-
-            nvidia_old)
-                sed -i \
-                    -e /'dxgi.customDeviceId =/c dxgi.customDeviceId = 222F' \
-                    -e /'dxgi.customVendorId =/c dxgi.customVendorId = 10de' \
-                "${DXVK_CONFIG_FILE}"
                 ;;
 
             nvidia_new)
@@ -3461,15 +3436,14 @@ start_portwine () {
                     -e /'dxgi.customDeviceDesc =/c dxgi.customDeviceDesc = "NVIDIA GeForce RTX 4090"' \
                     -e /'dxgi.customDeviceId =/c dxgi.customDeviceId = 2684' \
                     -e /'dxgi.customVendorId =/c dxgi.customVendorId = 10de' \
-                    -e /'dxgi.hideAmdGpu =/c dxgi.hideAmdGpu = True' \
                     -e /'dxgi.hideNvidiaGpu =/c dxgi.hideNvidiaGpu = False' \
                 "${DXVK_CONFIG_FILE}"
 
-                export WINE_HIDE_NVIDIA_GPU="0"
+                # export WINE_HIDE_AMD_GPU="1"
-                export WINE_HIDE_AMD_GPU="1"
                 export DXVK_NVAPI_DRIVER_VERSION="99999"
                 export DXVK_NVAPI_ALLOW_OTHER_DRIVERS="1"
-                export WINEHAGS="1"
+                export PW_USE_NVAPI_AND_DLSS="1"
+                export PW_USE_RAY_TRACING="1"
                 ;;
 
             low_latency)
@@ -3496,6 +3470,10 @@ start_portwine () {
         PATH_TO_GAME=$(dirname "$ue_exe_path")
     fi
 
+    for rm_dll in "nvngx.ini" "nvngx.dll" "_nvngx.dll" ; do
+        try_remove_file "${WINEPREFIX}/drive_c/windows/system32/$rm_dll"
+    done
+
     # remove old decky_framegen files
     if [[ -f "$PATH_TO_GAME/dlss-enabler.dll" ]] ; then
         for dll in amd_fidelityfx_dx12.dll amd_fidelityfx_vk.dll d3dcompiler_47.dll dlss-enabler.dll \
@@ -3541,8 +3519,8 @@ start_portwine () {
         fi
 
         export PW_WINE_FULLSCREEN_FSR="0"
-        export DXVK_ENABLE_NVAPI="1"
+
-        export PW_USE_RAY_TRACING="1"
+        set_to_dxvk_conf nvidia_new
 
         check_variables OPTISCALER_FG_TYPE "Nukems"
         sed -i "s|FGType =.*|FGType = $OPTISCALER_FG_TYPE|g" "$OPTISCALER_PATH/OptiScaler.ini"
@@ -3567,25 +3545,28 @@ start_portwine () {
             then try_copy_file "$OPTISCALER_PATH/$dll" "$PATH_TO_GAME/$dll"
             fi
         done
+    fi
 
-        for rm_dll in "nvngx.ini" "nvngx.dll" "_nvngx.dll" ; do
+    if [[ "${PW_USE_RAY_TRACING}" == "1" ]] ; then
-            try_remove_file "${WINEPREFIX}/drive_c/windows/system32/$rm_dll"
+        var_vkd3d_config_update dxr
-        done
+        var_radv_perftest_config_update rt
-    elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] ; then
+    else
-        DXVK_ENABLE_NVAPI="1"
+        var_vkd3d_config_update nodxr
-        try_remove_file "${WINEPREFIX}/drive_c/windows/system32/nvngx.ini"
+    fi
+
+    if [[ "${PW_USE_NVAPI_AND_DLSS}" == "1" ]] ; then
+        export DXVK_ENABLE_NVAPI="1"
+        if echo "$LSPCI_VGA" | grep -i -q 'nvidia' ; then
             FIND_NVNGX="$(dirname $(find /usr/* -type f -name "nvngx.dll" 2>/dev/null | head -n 1 | awk '{print $1}'))"
             if [[ -n "$FIND_NVNGX" ]] ; then
                 try_copy_file_with_checksums "${FIND_NVNGX}/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/nvngx.dll"
                 try_copy_file_with_checksums "${FIND_NVNGX}/_nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/_nvngx.dll"
+                var_winedlloverride_update "nvngx,_nvngx=n"
                 export NVIDIA_WINE_DLL_DIR="${FIND_NVNGX}"
             fi
-        var_winedlloverride_update "nvngx,_nvngx=n"
+        fi
     else
-        DXVK_ENABLE_NVAPI="0"
+        export DXVK_ENABLE_NVAPI="0"
-        for rm_dll in "nvngx.ini" "nvngx.dll" "_nvngx.dll" ; do
-            try_remove_file "${WINEPREFIX}/drive_c/windows/system32/$rm_dll"
-        done
     fi
 
     [[ "${PW_USE_LS_FRAME_GEN}" == "1" ]] && set_to_dxvk_conf low_latency
@@ -3608,16 +3589,6 @@ start_portwine () {
     [[ "${PW_MANGOHUD_USER_CONF}" == 1 ]] && unset MANGOHUD_CONFIG
     [[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && unset PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS
 
-    if [[ "${PW_USE_DXR11}" == 1 ]] \
-    || [[ "${PW_USE_DXR10}" == 1 ]] \
-    || [[ "${PW_USE_RAY_TRACING}" == 1 ]]
-    then
-        var_vkd3d_config_update dxr
-        var_radv_perftest_config_update rt
-    else
-        var_vkd3d_config_update nodxr
-    fi
-
     if [[ "${PW_GPU_USE}" != "disabled" ]] && [[ "${PW_AMD_VULKAN_USE}" == "disabled" ]] ; then
         export DXVK_FILTER_DEVICE_NAME="${PW_GPU_USE}"
         export VKD3D_FILTER_DEVICE_NAME="${PW_GPU_USE}"
@@ -5124,7 +5095,6 @@ gui_proton_downloader () {
     try_remove_file "${PW_TMPFS_PATH}/tmp_proton_sarek_git"
     try_remove_file "${PW_TMPFS_PATH}/tmp_proton_em_git"
     try_remove_file "${PW_TMPFS_PATH}/tmp_proton_ge_git"
-    try_remove_file "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git"
     try_remove_file "${PW_TMPFS_PATH}/tmp_installed_wine"
     try_remove_file "${PW_TMPFS_PATH}/tmp_set_wine"
 
@@ -5162,15 +5132,6 @@ gui_proton_downloader () {
         sed -i -e '/6.3/,$d' -e '/-x86/d' -e '/-wow64/d' -e '/^$/d' "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git"
     fi
 
-    # WINE_GE_CUSTOM
-    read -r -d '' -a WINE_GE_CUSTOM < <(curl -s "https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)
-    if [[ -n "${WINE_GE_CUSTOM[0]}" ]] ; then
-        for PGEGIT in "${WINE_GE_CUSTOM[@]}" ; do
-            echo "${PGEGIT}" | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git"
-        done
-        sed -i -e '/6.23/,$d' -e '/^$/d' "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git"
-    fi
-
     # PROTON_LG
     read -r -d '' -a PROTON_PW_GIT < <(curl -s "https://api.github.com/repos/Castro-Fidel/wine_builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4 | sort -r)
     if [[ -n "${PROTON_PW_GIT[0]}" ]] ; then
@@ -5215,7 +5176,7 @@ gui_proton_downloader () {
     for INSTALLING_VERSION_IN_DIST in * ; do
         sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PW_TMPFS_PATH}/tmp_proton_pw_git" \
         "${PW_TMPFS_PATH}/tmp_proton_ge_git" "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" \
-        "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" "${PW_TMPFS_PATH}/tmp_proton_sarek_git" \
+        "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" "${PW_TMPFS_PATH}/tmp_proton_sarek_git" \
         "${PW_TMPFS_PATH}/tmp_proton_em_git"
     done
     popd 1>/dev/null || fatal
@@ -5223,7 +5184,6 @@ gui_proton_downloader () {
     TMP_PROTON_PW_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_pw_git" | tr '\n' ' ')"
     TMP_PROTON_GE_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_ge_git" | tr '\n' ' ')"
     TMP_PROTON_KR_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_wine_kron4ek_git" | tr '\n' ' ')"
-    TMP_PROTON_CU_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_wine_ge_custom_git" | tr '\n' ' ')"
     TMP_PROTON_CACHYOS_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_cachyos_git" | tr '\n' ' ')"
     TMP_PROTON_SAREK_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_sarek_git" | tr '\n' ' ')"
     TMP_PROTON_EM_GIT="$(sed 's/^/FALSE /' "${PW_TMPFS_PATH}/tmp_proton_em_git" | tr '\n' ' ')"
@@ -5263,7 +5223,7 @@ gui_proton_downloader () {
         --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
         --column "${translations[Set]}" \
         --column "${translations[Select WINE for download:]}" \
-        $TMP_PROTON_CU_GIT \
+        $TMP_PROTON_CACHYOS_GIT \
         1>> "${PW_TMPFS_PATH}/tmp_set_wine" \
         2>/dev/null &
 
@@ -5271,7 +5231,7 @@ gui_proton_downloader () {
         --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
         --column "${translations[Set]}" \
         --column "${translations[Select WINE for download:]}" \
-        $TMP_PROTON_CACHYOS_GIT \
+        $TMP_PROTON_SAREK_GIT \
         1>> "${PW_TMPFS_PATH}/tmp_set_wine" \
         2>/dev/null &
 
@@ -5279,19 +5239,11 @@ gui_proton_downloader () {
         --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
         --column "${translations[Set]}" \
         --column "${translations[Select WINE for download:]}" \
-        $TMP_PROTON_SAREK_GIT \
-        1>> "${PW_TMPFS_PATH}/tmp_set_wine" \
-        2>/dev/null &
-
-        "${pw_yad}" --plug=$KEY_WINE --tabnum=7 --list --checklist --separator="" \
-        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
-        --column "${translations[Set]}" \
-        --column "${translations[Select WINE for download:]}" \
         $TMP_PROTON_EM_GIT \
         1>> "${PW_TMPFS_PATH}/tmp_set_wine" \
         2>/dev/null &
 
-        "${pw_yad}" --plug=$KEY_WINE --tabnum=8 --list --checklist --separator="" \
+        "${pw_yad}" --plug=$KEY_WINE --tabnum=7 --list --checklist --separator="" \
         --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
         --column "${translations[Set]}" \
         --column "${translations[Select installed WINE for delete:]}" \
@@ -5306,10 +5258,9 @@ gui_proton_downloader () {
         --tab="PROTON-LG!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
         --tab="WINE-KRON4EK!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
         --tab="PROTON-GE!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
-        --tab="WINE-GE-CUSTOM!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
         --tab="PROTON-CACHYOS!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
         --tab="PROTON-SAREK!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
-        --tab="Proton-EM!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
+        --tab="PROTON-EM!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
         --tab="${translations[INSTALLED]}!$PW_GUI_ICON_PATH/$TAB_SIZE.png!" \
         --button="${translations[CANCEL]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!":1 \
         --button="${translations[OK]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!":0 2>/dev/null
@@ -5380,7 +5331,7 @@ gui_proton_downloader () {
 
     if [[ "$1" != "silent" ]] ; then
         for GIVE_ALL_WINE in ${VERSION_WINE_GIT} ; do
-            for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do
+            for GIVE_WINE_URL in "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do
                 if [[ ${GIVE_WINE_URL^^} =~ ${GIVE_ALL_WINE^^}.TAR ]] ; then
                     export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL
                 fi
@@ -5391,7 +5342,7 @@ gui_proton_downloader () {
         restart_pp
     else
         print_error "$PW_WINE_USE"
-        for GIVE_WINE_URL in "${WINE_GE_CUSTOM[@]}" "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do
+        for GIVE_WINE_URL in "${PROTON_GE_GIT[@]}" "${WINE_KRON4EK[@]}" "${PROTON_PW_GIT[@]}" "${PROTON_CACHYOS_GIT[@]}" "${PROTON_SAREK_GIT[@]}" "${PROTON_EM_GIT[@]}" ; do
             if [[ ${GIVE_WINE_URL^^} =~ ${PW_WINE_USE^^} ]] ; then
                 export URL_VERSION_PROTON_GIT=$GIVE_WINE_URL
             fi

data_from_portwine/scripts/var

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2433
+#SCRIPTS_NEXT_VERSION=2435
-#SCRIPTS_STABLE_VERSION=2425
+#SCRIPTS_STABLE_VERSION=2435
 ########################################################################
 export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"
 export PROTON_USE_XALIA="0"