From 481d83890a63e467086a55cad365b219147c4c9c Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Fri, 7 May 2021 21:23:20 +0300 Subject: [PATCH] ###Scripts version 1069### --- data_from_portwine/changelog | 8 +++- .../scripts/portwine_db/EpicGamesLauncher | 7 ++- data_from_portwine/scripts/portwine_db/NovaRO | 43 ++++++++++++++++++ .../scripts/portwine_db/SimCity | 10 +++++ .../scripts/portwine_db/SkyrimSE | 8 ++++ data_from_portwine/scripts/portwine_db/iw3sp | 42 ++++++++++++++++++ data_from_portwine/scripts/portwine_db/iw4sp | 44 +++++++++++++++++++ data_from_portwine/scripts/portwine_db/wgc | 4 +- data_from_portwine/scripts/runlib | 2 +- data_from_portwine/scripts/start.sh | 30 +++++++++---- 10 files changed, 180 insertions(+), 18 deletions(-) create mode 100644 data_from_portwine/scripts/portwine_db/NovaRO create mode 100644 data_from_portwine/scripts/portwine_db/SimCity create mode 100644 data_from_portwine/scripts/portwine_db/SkyrimSE create mode 100644 data_from_portwine/scripts/portwine_db/iw3sp create mode 100644 data_from_portwine/scripts/portwine_db/iw4sp diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index b7370576..52869ac5 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -1,8 +1,8 @@ История изменений и дальнейшие планы: ----------------------------------------- В планах: +* создать ветку beta на github и сделать выбор версии внутри порта * проверить Overwatch -* проверить первый запуск после автоустановки на выбор режима запуска (Vulkan), проверить пересоздание ярлыков * перенести reset в GUI PortProton * добавить фикс установки dotnet * добавить кнопку очистки префикса в PortProton @@ -15,8 +15,12 @@ * добавить контроль за окнами для правильного отключения прогресс бара * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 1069### +* обновлены db файлы +* HOTFIX - закомментирована переменная __NV_PRIME_RENDER_OFFLOAD=1 для работы некоторых игр в оконном режиме с видеокартой от NVIDIA + ###PortProton-79### 04.05.2021 ###Scripts version 1068### -* обновлен Proton до версии 6.3-3 от 05.05.2021 +* обновлен Proton до версии 6.3-3 от 04.05.2021 ###Scripts version 1067### * HOTFIX - удален аргумент /b при запуске приложений (fix для WGC) diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index 155ea273..afba1dca 100644 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -3,7 +3,6 @@ #EpicGamesLauncher.exe #Rating=5 ################################################ -export WINEDLLOVERRIDES="libglesv2=" -export LAUNCH_PARAMETERS="-opengl -SkipBuildPatchPrereq" -export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2013 vcrun2017 d3dcompiler_43 d3dcompiler_47 d3dx9" -export MESA_GL_VERSION_OVERRIDE=4.4COMPAT +export LAUNCH_PARAMETERS="-opengl" +export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2013 vcrun2019 d3dcompiler_43 d3dcompiler_47 d3dx9" + diff --git a/data_from_portwine/scripts/portwine_db/NovaRO b/data_from_portwine/scripts/portwine_db/NovaRO new file mode 100644 index 00000000..5db65172 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/NovaRO @@ -0,0 +1,43 @@ +#!/bin/bash +#Author: sergey +#Nova Patcher.exe +#NovaRO.exe +#Rating=1-5 +######################################################## +export PW_DLL_INSTALL="d3dcompiler_42 d3dcompiler_43 d3dx9" +#directx9 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXVK_VER=1.8.1 +##export PW_VKD3D_VER=2.2 +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=1 +##export PW_HIDE_NVIDIA_GPU=1 +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VKD3D_FEATURE_LEVEL=1 +##export PW_DXGI_FROM_DXVK=1 +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export ENABLE_VKBASALT=1 +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=1 +##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=1 # Force run in terminal +##export PW_LOG=1 # Enable debug mode fo terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/SimCity b/data_from_portwine/scripts/portwine_db/SimCity new file mode 100644 index 00000000..1524dbab --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/SimCity @@ -0,0 +1,10 @@ +#!/bin/bash +#Author: Cefeiko +#SimCity.exe +#Rating=1-5 +######################################################## +export PW_COMMENT_DB="SimCity 5" +export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2019 d3dcompiler_43 d3dcompiler_47 d3dx9" # Install DDL in port prefix (used winetricks) +export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_NO_ESYNC=1 +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP diff --git a/data_from_portwine/scripts/portwine_db/SkyrimSE b/data_from_portwine/scripts/portwine_db/SkyrimSE new file mode 100644 index 00000000..6014e11e --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/SkyrimSE @@ -0,0 +1,8 @@ +#!/bin/bash +#Author: kbp95 +#SkyrimSE.exe +#Rating=1-5 +######################################################## +export PW_VULKAN_USE=dxvk +export PULSE_LATENCY_MSEC=90 +export WINEDLLOVERRIDES="xaudio2_7=n,b" diff --git a/data_from_portwine/scripts/portwine_db/iw3sp b/data_from_portwine/scripts/portwine_db/iw3sp new file mode 100644 index 00000000..d19815d1 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/iw3sp @@ -0,0 +1,42 @@ +#!/bin/bash + #Author: xihnik + #iw3sp.exe + #Rating=1-5 + ################################################ + export PW_VULKAN_USE=dxvk + export PW_DLL_INSTALL="vcrun2019 d3dx9" + export PW_NO_FSYNC=1 + export PW_VIRTUAL_DESKTOP=1 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXVK_VER=1.8.1 +##export PW_VKD3D_VER=2.2 +##export WINEDLLOVERRIDES="blabla=n,b" +##export PW_DLL_INSTALL="vcrun2019 vcrun6" # Install DDL in port prefix (used winetricks) +##export PW_LOG=0 # Enable debug mode fo terminal +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_USE_TERMINAL=0 # Force run in terminal +##export PW_OLD_GL_STRING=0 +##export PW_NVAPI_DISABLE=1 +##export PW_VKD3D_FEATURE_LEVEL=0 +##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HIDE_NVIDIA_GPU=0 +##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_VIRTUAL_DESKTOP=1 +##export DXVK_HUD=fps,devinfo +##export PW_HEAP_DELAY_FREE=0 +##export PW_DXGI_FROM_DXVK=0 +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/iw4sp b/data_from_portwine/scripts/portwine_db/iw4sp new file mode 100644 index 00000000..17b174a8 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/iw4sp @@ -0,0 +1,44 @@ +#!/bin/bash + #Author: xihnik + #iw4sp.exe + #Rating=1-5 + ################################################ + export PW_VULKAN_USE=dxvk + export PW_DLL_INSTALL="vcrun2019 d3dx9" + export PW_NO_FSYNC=1 + #export PW_FORCE_USE_VSYNC=0 + #export PW_WINDOWS_VER=7 + export PW_VIRTUAL_DESKTOP=1 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXVK_VER=1.8.1 +##export PW_VKD3D_VER=2.2 +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=0 +##export PW_HIDE_NVIDIA_GPU=0 +##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VKD3D_FEATURE_LEVEL=0 +##export PW_DXGI_FROM_DXVK=0 +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=0 +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=0 # Force run in terminal +##export PW_LOG=0 # Enable debug mode fo terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index a4289d4f..11f60a5b 100644 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -7,7 +7,7 @@ export LAUNCH_PARAMETERS="--disable-gpu" # Additional launch options #export PW_USE_TERMINAL=1 #export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP -export PW_NVAPI_DISABLE=1 +#export PW_NVAPI_DISABLE=1 #export WINEDLLOVERRIDES="xaudio2_7=n" export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks) ##export PW_GUI_DISABLED_CS=1 @@ -15,4 +15,4 @@ export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG ADD_IN_START_PORTWINE () { sed -i 's/true/false/g' "$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/preferences.xml" -} \ No newline at end of file +} diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 11f9dac0..f8f8e24e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -382,7 +382,7 @@ START_PORTWINE () export optirun_on="prime-run" export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json fi - export __NV_PRIME_RENDER_OFFLOAD=1 + #export __NV_PRIME_RENDER_OFFLOAD=1 export __GLX_VENDOR_LIBRARY_NAME=nvidia if [ ! -d "${PORT_WINE_TMP_PATH}"/gl_shader_cache ] ; then mkdir -p "${PORT_WINE_TMP_PATH}"/gl_shader_cache diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 1b1f6899..20969f3c 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -265,7 +265,7 @@ else export -f open_changelog export KEY=$RANDOM - "${pw_yad}" --plug=$KEY --tabnum=2 --form --columns=2 --scroll \ + "${pw_yad}" --plug=$KEY --tabnum=3 --form --columns=2 --scroll \ --field=" Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png":"BTN" '@bash -c "button_click PW_WGC"' \ --field=" Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png":"BTN" '@bash -c "button_click PW_BATTLE_NET"' \ --field=" Epic Games Launcher"!"$PW_GUI_ICON_PATH/epicgames.png":"BTN" '@bash -c "button_click PW_EPIC"' \ @@ -273,24 +273,36 @@ else --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png":"BTN" '@bash -c "button_click PW_EVE"' \ --field=" Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png":"BTN" '@bash -c "button_click PW_ORIGIN"' & \ + "${pw_yad}" --plug=${KEY} --tabnum=2 --columns=3 --form --separator=";" \ + --image "$PW_GUI_ICON_PATH/port_proton.png" \ + --field=":CB" " DXVK (DX 9-11 to Vulkan)"\!"VKD3D (DX 12 to Vulkan)"\!"OPENGL " \ + --field=":LBL" "" \ + --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \ + --field='WINEREG'!!"${loc_winereg}":"BTN" '@bash -c "button_click WINEREG"' \ + --field="${portname}-${install_ver} (${scripts_install_ver})"!!"":"FBTN" '@bash -c "open_changelog"' \ + --field=":LBL" "" \ + --field='WINECMD'!!"${loc_winecmd}":"BTN" '@bash -c "button_click WINECMD"' \ + --field='WINETRICKS'!!"${loc_winetricks}":"BTN" '@bash -c "button_click WINETRICKS"' \ + --field="F.A.Q."!!"":"FBTN" '@bash -c "xdg-open https://portwine-linux.ru/portwine-faq/ ; button_click"' \ + --field=":LBL" "" \ + --field='REINSTALL'!!"${loc_reinstall}":"BTN" '@bash -c "button_click PW_REINSTALL"' \ + --field='CLEAR PFX'!!"${loc_clear}":"BTN" '@bash -c "button_click PW_CLEAR_PFX"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & \ + "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \ --image "$PW_GUI_ICON_PATH/port_proton.png" \ --field=":CB" " DXVK (DX 9-11 to Vulkan)"\!"VKD3D (DX 12 to Vulkan)"\!"OPENGL " \ --field=":LBL" "" \ - --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \ - --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \ + --field='WINEFILE'!!"${loc_winefile}":"BTN" '@bash -c "button_click WINEFILE"' \ --field="${portname}-${install_ver} (${scripts_install_ver})"!!"":"FBTN" '@bash -c "open_changelog"' \ --field=":LBL" "" \ - --field='WINEFILE'!!"${loc_winefile}":"BTN" '@bash -c "button_click WINEFILE"' \ - --field='WINECMD'!!"${loc_winecmd}":"BTN" '@bash -c "button_click WINECMD"' \ + --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \ --field="F.A.Q."!!"":"FBTN" '@bash -c "xdg-open https://portwine-linux.ru/portwine-faq/ ; button_click"' \ - --field=":LBL" "" \ - --field='WINEREG'!!"${loc_winereg}":"BTN" '@bash -c "button_click WINEREG"' \ - --field='WINETRICKS'!!"${loc_winetricks}":"BTN" '@bash -c "button_click WINETRICKS"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & \ + --field=":LBL" "" &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" \ + --field='STOP'!!"${loc_stop}":"BTN" '@bash -c "button_click PW_STOP"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & \ "${pw_yad}" --key=$KEY --notebook --borders=10 --width=1000 --height=168 --no-buttons --text-align=center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "$portname" --separator=";" \ - --tab-pos=right --tab="PORT_PROTON" --tab="AUTOINSTALL" --center + --tab-pos=right --tab="PORT_PROTON" --tab="SETTINGS" --tab="AUTOINSTALL" --center if [ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form" ] ; then export PW_YAD_SET=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form" | head -n 1 | awk '{print $1}'`