From 6620fa65829340bd6e934a23100256e347d3516f Mon Sep 17 00:00:00 2001
From: castro-fidel <castro-fidel@rosa2021.1>
Date: Wed, 5 Oct 2022 03:37:35 +0300
Subject: [PATCH] Scripts version 2133

---
 data_from_portwine/changelog_eng              |  9 +++++-
 data_from_portwine/changelog_rus              |  7 +++++
 data_from_portwine/dxvk.conf                  |  1 +
 data_from_portwine/scripts/functions_helper   | 10 +++---
 data_from_portwine/scripts/lang               |  1 +
 data_from_portwine/scripts/portwine_db/Origin | 22 ++-----------
 data_from_portwine/scripts/portwine_db/steam  |  2 +-
 data_from_portwine/scripts/runlib             | 31 ++++++++-----------
 data_from_portwine/scripts/start.sh           | 10 +++---
 data_from_portwine/scripts/var                |  9 +++---
 data_from_portwine/scripts/zen_yad_gui        |  2 +-
 11 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index 697962b1..142dd1c0 100644
--- a/data_from_portwine/changelog_eng
+++ b/data_from_portwine/changelog_eng
@@ -2,10 +2,17 @@ You can help us in the development of the project on the website: boosty.to/linu
 -----------------------------------------
 Changelog:
 
+###Scripts version 2133###
+* update libs_v33 (steam runtime sniper container 09/29/2022, version MANGOHUD 0.6.8)
+* update plugins_v8 (updated version of FAKE DLSS - FSR 2.1.1)
+* removed variables from the EDIT_DB menu that are no longer necessary
+* made a small optimization of scripts to speed up the launch of games 
+* ORIGIN is working again (if you already have ORIGIN installed, enable USE_TERMINAL in EDIT_DB)
+
 ###Scripts version 2132###
 * ATTENTION! The site portwine-linux.ru which is working again - FAKE! What kind of person did this and with what motives is unknown. So be vigilant! The site of our project: LINUX-GAMING.RU - and once again I will ask all the authors of their sites and Youtube channels to change their links. Thank you.
 
-###Scripts version 2132###
+###Scripts version 2131###
 * HOTFIX and change url
 
 ###Scripts version 2130###
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index 8ad253fe..79d0caf2 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,6 +2,13 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2133###
+* обновление libs_v33 (контейнер steam runtime sniper 29.09.2022, версия MANGOHUD 0.6.8)
+* обновление plugins_v8 (обновлена версия FAKE DLSS - FSR 2.1.1)
+* из меню EDIT_DB удалены переменные в которых более нет необходимости
+* произведена небольшая оптимизация скриптов для ускорения запуска игр 
+* ORIGIN снова работает (если у вас уже установлен ORIGIN, включите USE_TERMINAL в EDIT_DB)
+
 ###Scripts version 2132###
 * добавлен фикс для работы PortProton на системах Alt и Simply Linux (подготовка к возможному добавлению в репозитории)
 * ВНИМАНИЕ! Сайт portwine-linux.ru который снова заработал - ФЕЙК! Что за человек это сделал и с какими мотивами - неизвестно. Так что будте бдительны! Сайт нашего проекта: LINUX-GAMING.RU - и еще раз попрошу всех авторов своих сайтов и каналов на Youtube сменить ссылки у себя. Спасибо.
diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf
index 04962fc6..5e88284d 100755
--- a/data_from_portwine/dxvk.conf
+++ b/data_from_portwine/dxvk.conf
@@ -36,6 +36,7 @@ dxgi.customVendorId = 10de
 # Supported values: True, False
 
 dxgi.nvapiHack = False
+dxvk.enableAsync = True
 
 # Override maximum amount of device memory and shared system memory
 # reported to the application. This may fix texture streaming issues
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 272dc56c..bb8e1a32 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -325,13 +325,13 @@ init_wine_ver () {
                 echo "${WINEDIR}/share/wine/${mono_gecko_chk} is broken symlink. Repair... OK."
             fi
         done
+
         grep 'Global,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' "${WINEDIR}/share/wine/wine.inf"
         if [[ "$?" != "0" ]] ; then
             echo 'HKLM,Software\NVIDIA Corporation\Global,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' >> "${WINEDIR}/share/wine/wine.inf"
-        fi
-        grep 'nvlddmkm,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' "${WINEDIR}/share/wine/wine.inf"
-        if [[ "$?" != "0" ]] ; then
             echo 'HKLM,System\ControlSet001\Services\nvlddmkm,"{41FCC608-8496-4DEF-B43E-7D9BD675A6FF}",0x10001,0x00000001' >> "${WINEDIR}/share/wine/wine.inf"
+            sed -i '/Steam.exe/d' "${WINEDIR}/share/wine/wine.inf"
+            sed -i '/\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf"
         fi
     fi
     return 0
@@ -365,6 +365,8 @@ pw_init_runtime () {
     if [ "${PW_USE_GSTREAMER}" = 1 ] ; then 
         if [ -d "${WINEDIR}/lib64/gstreamer-1.0" ] ; then
             export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0"
+        elif [ -d "${PW_WINELIB}/portable/lib/lib64/gstreamer-1.0" ] ; then
+            export GST_PLUGIN_SYSTEM_PATH_1_0="${PW_WINELIB}/portable/lib/lib64/gstreamer-1.0:${PW_WINELIB}/portable/lib/lib32/gstreamer-1.0"
         fi
         export WINE_GST_REGISTRY_DIR="${PORT_WINE_TMP_PATH}"
         export MEDIACONV_AUDIO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/audio.foz
@@ -636,7 +638,7 @@ pw_check_and_download_plugins () {
         do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_PLUGINS}"
         done
     fi
-    if [[ ! -d "${PW_PLUGINS_PATH}/BattlEye_Runtime" || ! -d "${PW_PLUGINS_PATH}/d3d_extras" \
+    if [[ ! -d "${PW_PLUGINS_PATH}/BattlEye_Runtime" || ! -d "${PW_PLUGINS_PATH}/fake_dlss" \
     || ! -d "${PW_PLUGINS_PATH}/nvapi" || ! -d "${PW_PLUGINS_PATH}/nvml" ]]
     then
         print_info "Download and install plugins${PW_PLUGINS_VER}..."
diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang
index 7adab1ce..30a70f99 100755
--- a/data_from_portwine/scripts/lang
+++ b/data_from_portwine/scripts/lang
@@ -109,6 +109,7 @@ then
 	export PW_USE_AMDVLK_DRIVER_INFO='Использовать драйвер AMDVLK вместо RADV на видеокартах от AMD'
 	export PW_USE_SHADER_CACHE_INFO='Использовать кеширование шейдеров средствами WINE (отключать только при наличии микрофризов в игре)'
 	export PW_WINE_FULLSCREEN_FSR_INFO='Работает во время использования любой версии ProtonGE в полноэкранном режиме при разрешении ниже стандартного для экрана'
+	export PW_USE_FAKE_DLSS_INFO='Включить транслятор DLSS в FSR 2 в играх DirectX 12'
 
 	export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)'
 	export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместо с CAS'
diff --git a/data_from_portwine/scripts/portwine_db/Origin b/data_from_portwine/scripts/portwine_db/Origin
index 60f1e9a4..40226b6e 100755
--- a/data_from_portwine/scripts/portwine_db/Origin
+++ b/data_from_portwine/scripts/portwine_db/Origin
@@ -1,26 +1,8 @@
 #!/usr/bin/env bash
 #Author: PortWINE
 #Origin.exe 
-#Rating=?
+#Rating=5
 #####################examples###########################
 export PW_DLL_INSTALL="vcrun2012 vcrun2019"               # Install DDL in port prefix (used winetricks) 
 export PW_VULKAN_USE=1                       # dxvk, vkd3d or 0 for OpenGL
-###WINE_KRON4EK###
-export PW_WINE_USE="WINE-7.13-STAGING-AMD64"
-
-check_download_wine_ver_for_origin () {
-    if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
-        if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/7.13/wine-7.13-staging-amd64.tar.xz" \
-        "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then
-            if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then
-                try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
-                UNPACK_STATUS=0
-            else
-                try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz"
-                try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}"
-            fi
-        fi
-        [[ "${UNPACK_STATUS}" != 0 ]] && exit 1
-    fi
-}
-check_download_wine_ver_for_origin
+export PW_USE_TERMINAL="1"
diff --git a/data_from_portwine/scripts/portwine_db/steam b/data_from_portwine/scripts/portwine_db/steam
index 8ddcb0fc..c74fe879 100755
--- a/data_from_portwine/scripts/portwine_db/steam
+++ b/data_from_portwine/scripts/portwine_db/steam
@@ -9,4 +9,4 @@ export PW_DLL_INSTALL="vcrun2019 d3dcompiler_46"
 export WINEDLLOVERRIDES="libglesv2,lsteamclient="
 export LAUNCH_PARAMETERS="-no-cef-sandbox"
 export PW_VULKAN_USE=1
-export PW_WINE_USE=PROTON_LG
+export PW_WINE_USE=PROTON_GE
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index ee1cd14d..908efbdf 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -48,19 +48,7 @@ start_portwine () {
     fi
     pw_install_dll_in_prefix 
     init_wine_ver
-    grep 'Steam.exe' "${WINEDIR}/share/wine/wine.inf"
-    if [[ "$?" == "0" ]] ; then
-        sed -i '/Steam.exe/d' "${WINEDIR}/share/wine/wine.inf"
-    fi
-    grep '\\Valve\\Steam' "${WINEDIR}/share/wine/wine.inf"
-    if [[ "$?" == "0" ]] ; then
-        sed -i '/\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf"
-    fi
-    if [ -x "`which konsole 2>/dev/null`" ]; then export PW_TERM="konsole --nofork -e"
-    elif [ -x "`which lxterminal 2>/dev/null`" ]; then export PW_TERM="lxterminal -e"
-    elif [ -x "`which xterm 2>/dev/null`" ]; then export PW_TERM="${PW_XTERM}"
-    else export PW_TERM="${PW_XTERM}"
-    fi
+
     if [ ! -f "${HOME}/.Xresources" ]; then
         cp -f "${PORT_SCRIPTS_PATH}/.Xresources" "${HOME}"
         xrdb -merge "${HOME}/.Xresources"
@@ -314,6 +302,10 @@ start_portwine () {
     export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/EasyAntiCheat_Runtime"
     var_winedlloverride_update "beclient,beclient_x64=b,n"
     #try link d3d extras libs
+    if  [[ -d "${PW_PLUGINS_PATH}/d3d_extras" ]]
+    then PATH_TO_D3DEXTRAS="${PW_PLUGINS_PATH}/d3d_extras"
+    else PATH_TO_D3DEXTRAS="${PW_WINELIB}/d3d_extras"
+    fi
     for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \
     d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \
     d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \
@@ -321,8 +313,8 @@ start_portwine () {
     d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43
     do
         if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then
-            try_force_link_file "${PW_PLUGINS_PATH}/d3d_extras/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
-            try_force_link_file "${PW_PLUGINS_PATH}/d3d_extras/x32/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
+            try_force_link_file "${PATH_TO_D3DEXTRAS}/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
+            try_force_link_file "${PATH_TO_D3DEXTRAS}/x32/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
             var_winedlloverride_update "${d3d_extras_from_plugins}=n,b"
         else
             if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
@@ -534,7 +526,7 @@ start_portwine () {
     fi
     if [[ "${portwine_exe}" == *-Shipping.exe ]] ; then 
         echo "Disable EAC"
-        [[ -z "${LAUNCH_PARAMETERS}" ]] && export LAUNCH_PARAMETERS+="-eac-nop-loaded "
+        [[ -z "${LAUNCH_PARAMETERS}" ]] && export LAUNCH_PARAMETERS+=" -eac-nop-loaded "
     fi
     sleep 1
     pw_stop_progress_bar &&
@@ -573,8 +565,11 @@ pw_run () {
         VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \
         "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
     else
-        [[ "${PW_USE_TERMINAL}" != "1" ]] && export PW_TERM=""
-        $PW_TERM ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \
+        if [[ "${PW_USE_TERMINAL}" == "1" ]] ; then
+            export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
+            pw_init_runtime
+        fi
+        ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \
         env ${PW_MANGOHUD_SLR} \
         PATH="${PATH}" \
         LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 98829c92..81a0b581 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -403,16 +403,16 @@ pw_create_prefix_backup () {
 
 pw_edit_db () {
     pw_gui_for_edit_db \
-    PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \
-    PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP \
-    PW_WINEDBG_DISABLE PW_USE_TERMINAL PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_GUI_DISABLED_CS PW_USE_GSTREAMER \
-    PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_USE_AMDVLK_DRIVER \
-    PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE 
+    PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 PW_USE_NVAPI_AND_DLSS \
+    PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \
+    PW_HEAP_DELAY_FREE PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS \
+    PW_FIX_VIDEO_IN_GAME PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE 
     if [ "$?" == 0 ] ; then
         echo "Restarting PP after update ppdb file..."
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     fi
+    # PW_WINE_ALLOW_XIM PW_FORCE_USE_VSYNC PW_WINEDBG_DISABLE PW_USE_GSTREAMER PW_USE_AMDVLK_DRIVER
 }
 
 pw_autoinstall_from_db () {
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 832eabdb..bda85ba8 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=2132
+#SCRIPTS_NEXT_VERSION=2133
 ########################################################################
 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
@@ -16,12 +16,11 @@ export PW_NO_ESYNC="1"
 export PW_USE_GAMEMODE="1"
 export PW_FORCE_USE_VSYNC="2"
 export PW_LOG="0"
-export PW_TERM=""
 export PW_USE_TERMINAL="0"
 export PW_WINEDBG_DISABLE="1"
 export PW_WINDOWS_VER="10"
 export WINEARCH="win64"
-export PW_LIBS_VER="_v32"
+export PW_LIBS_VER="_v33"
 export LG_SITE_URL="https://linux-gaming.ru/"
 export GDK_BACKEND="x11"
 export PW_USE_GSTREAMER="1"
@@ -33,8 +32,8 @@ export STAGING_SHARED_MEMORY="1"
 export PW_FORCE_LARGE_ADDRESS_AWARE="1"
 ###DEFAULT_WINE###
 export PW_WINE_USE="PROTON_LG"
-export PW_PLUGINS_VER="_v7"
-export PW_FAKE_DLSS_VER="2.1-3001-0-7-5-1662667880"
+export PW_PLUGINS_VER="_v8"
+export PW_FAKE_DLSS_VER="051022"
 ###WINE_PROTON_LG###
 export PW_LG_VER="7-29"
 export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}"
diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui
index 7be9e492..87d1928e 100644
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@@ -188,7 +188,7 @@ pw_gui_for_edit_db () {
     --field=":LBL" "" \
     --field="MANGOHUD FPS LIMIT (0-disabled):SCL" ${FPS_LIMIT_VAR} 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & 
 
-    "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="550" \
+    "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="450" \
     --text "Change settings in database file for ${PORTWINE_DB}\n" --separator=" " --borders=10 --center \
     --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --button="CANCEL":1 --button="OPEN DB FILE":150 --button="SAVE CHANGES":0
     YAD_STATUS="$?"