Scripts version 2110
This commit is contained in:
parent
5fa3dd120c
commit
efaeef7749
@ -2,6 +2,11 @@ You can help us in the development of the project on the website: boosty.to/port
|
|||||||
-----------------------------------------
|
-----------------------------------------
|
||||||
Changelog:
|
Changelog:
|
||||||
|
|
||||||
|
###Scripts version 2110###
|
||||||
|
* updated "PROTON_GE" to version 7-20
|
||||||
|
* fixed the work of the game World of Warplanes
|
||||||
|
* variable PW_D3D_EXTRAS_DISABLE renamed to PW_USE_D3D_EXTRAS and disabled by default
|
||||||
|
|
||||||
###Scripts version 2109###
|
###Scripts version 2109###
|
||||||
* update "libs_v31"
|
* update "libs_v31"
|
||||||
* updated "PROTON_GE" to version 7-19
|
* updated "PROTON_GE" to version 7-19
|
||||||
|
@ -2,6 +2,11 @@
|
|||||||
-----------------------------------------
|
-----------------------------------------
|
||||||
История изменений:
|
История изменений:
|
||||||
|
|
||||||
|
###Scripts version 2110###
|
||||||
|
* обновлен "PROTON_GE" до версии 7-20
|
||||||
|
* исправлена работа игры World of Warplanes
|
||||||
|
* переменная PW_D3D_EXTRAS_DISABLE переименована в PW_USE_D3D_EXTRAS и выключена по умолчанию (в связи с развитием WINE сторонние библиотеки DirectX нужны в меньшем количестве игр)
|
||||||
|
|
||||||
###Scripts version 2109###
|
###Scripts version 2109###
|
||||||
* обновлен "libs_v31" (HOTFIX для Rosa Linux)
|
* обновлен "libs_v31" (HOTFIX для Rosa Linux)
|
||||||
* обновлен "PROTON_GE" до версии 7-19
|
* обновлен "PROTON_GE" до версии 7-19
|
||||||
|
@ -103,7 +103,7 @@ then
|
|||||||
export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12'
|
export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12'
|
||||||
export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)'
|
export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)'
|
||||||
export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)'
|
export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)'
|
||||||
export PW_D3D_EXTRAS_DISABLE_INFO='Отключить принудительное использование сторонних библиотек DirectX'
|
export PW_USE_D3D_EXTRAS='Включить принудительное использование сторонних библиотек DirectX'
|
||||||
export PW_PRIME_RENDER_OFFLOAD_INFO='Включить дискретную видеокарту NVIDIA для ноутбуков с гибридной графикой (при поддержке установленого драйвера в ОС)'
|
export PW_PRIME_RENDER_OFFLOAD_INFO='Включить дискретную видеокарту NVIDIA для ноутбуков с гибридной графикой (при поддержке установленого драйвера в ОС)'
|
||||||
export PW_USE_WINDOWS_7_INFO='Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе'
|
export PW_USE_WINDOWS_7_INFO='Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе'
|
||||||
export PW_USE_AMDVLK_DRIVER_INFO='Использовать драйвер AMDVLK вместо RADV на видеокартах от AMD'
|
export PW_USE_AMDVLK_DRIVER_INFO='Использовать драйвер AMDVLK вместо RADV на видеокартах от AMD'
|
||||||
|
@ -17,5 +17,7 @@ export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used
|
|||||||
##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG
|
##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG
|
||||||
|
|
||||||
add_in_start_portwine () {
|
add_in_start_portwine () {
|
||||||
sed -i 's%<igbHardwareAccelerationEnabled> true </igbHardwareAccelerationEnabled>%<igbHardwareAccelerationEnabled> false </igbHardwareAccelerationEnabled>%' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml"
|
if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then
|
||||||
|
sed -i 's%<igbHardwareAccelerationEnabled> true </igbHardwareAccelerationEnabled>%<igbHardwareAccelerationEnabled> false </igbHardwareAccelerationEnabled>%' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Author: Castro-Fidel (PortWINE-Linux.ru)
|
# Author: Castro-Fidel (PortWINE-Linux.ru)
|
||||||
########################################################################
|
########################################################################
|
||||||
export LAUNCH_PARAMETERS=("/VERYSILENT")
|
export LAUNCH_PARAMETERS=("/VERYSILENT")
|
||||||
export GOG_VER=2.0.46.133
|
export GOG_VER=2.0.48.63
|
||||||
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe"
|
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe"
|
||||||
start_portwine
|
start_portwine
|
||||||
if try_download "content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}"
|
if try_download "content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}"
|
||||||
|
@ -251,12 +251,14 @@ start_portwine () {
|
|||||||
if [[ -d "${PW_PLUGINS_PATH}/default_pfx/" ]] ; then
|
if [[ -d "${PW_PLUGINS_PATH}/default_pfx/" ]] ; then
|
||||||
cp -frL "${PW_PLUGINS_PATH}/default_pfx/"* "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/"
|
cp -frL "${PW_PLUGINS_PATH}/default_pfx/"* "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/"
|
||||||
fi
|
fi
|
||||||
${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
|
${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
|
||||||
|
# ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINESERVER}" -w &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
|
||||||
wait_wineserver &&
|
wait_wineserver &&
|
||||||
echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
|
echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
|
||||||
elif [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" ]] ; then
|
elif [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" ]] ; then
|
||||||
check_dirs_and_files_in_pfx
|
check_dirs_and_files_in_pfx
|
||||||
${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
|
${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
|
||||||
|
# ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINESERVER}" -w &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
|
||||||
wait_wineserver &&
|
wait_wineserver &&
|
||||||
echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
|
echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
|
||||||
fi
|
fi
|
||||||
@ -281,11 +283,18 @@ start_portwine () {
|
|||||||
d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \
|
d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \
|
||||||
d3dx10_42 d3dx10_43 d3dx10 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \
|
d3dx10_42 d3dx10_43 d3dx10 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \
|
||||||
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
|
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
|
do
|
||||||
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/"
|
if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then
|
||||||
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 "${PW_PLUGINS_PATH}/d3d_extras/x64/${d3d_extras_from_plugins}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
|
||||||
if [[ "${PW_D3D_EXTRAS_DISABLE}" != 1 ]] ; then
|
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/"
|
||||||
var_winedlloverride_update "${d3d_extras_from_plugins}=n,b"
|
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/"
|
||||||
|
then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/"
|
||||||
|
fi
|
||||||
|
if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
|
||||||
|
then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/${d3d_extras_from_plugins}.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ -z "`grep "${d3d_extras_from_plugins}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then
|
if [[ -z "`grep "${d3d_extras_from_plugins}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then
|
||||||
echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"
|
echo "${d3d_extras_from_plugins}" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"
|
||||||
|
@ -151,7 +151,7 @@ portwine_start_debug () {
|
|||||||
echo "!!!gamemod not found!!!" >> "${PORT_WINE_PATH}/${portname}.log"
|
echo "!!!gamemod not found!!!" >> "${PORT_WINE_PATH}/${portname}.log"
|
||||||
fi
|
fi
|
||||||
echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
|
echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
|
||||||
if [[ "${PW_D3D_EXTRAS_DISABLE}" == 1 ]]
|
if [[ "${PW_USE_D3D_EXTRAS}" != 1 ]]
|
||||||
then echo "D3D_EXTRAS - disabled" >> "${PORT_WINE_PATH}/${portname}.log"
|
then echo "D3D_EXTRAS - disabled" >> "${PORT_WINE_PATH}/${portname}.log"
|
||||||
else echo "D3D_EXTRAS - enabled" >> "${PORT_WINE_PATH}/${portname}.log"
|
else echo "D3D_EXTRAS - enabled" >> "${PORT_WINE_PATH}/${portname}.log"
|
||||||
fi
|
fi
|
||||||
@ -398,7 +398,7 @@ pw_edit_db () {
|
|||||||
PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_DXR10 PW_USE_DXR11 \
|
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_WINE_FULLSCREEN_FSR PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP \
|
PW_USE_NVAPI_AND_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_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_D3D_EXTRAS_DISABLE PW_FIX_VIDEO_IN_GAME PW_USE_AMDVLK_DRIVER \
|
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_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE
|
||||||
if [ "$?" == 0 ] ; then
|
if [ "$?" == 0 ] ; then
|
||||||
/usr/bin/env bash -c ${pw_full_command_line[*]} &
|
/usr/bin/env bash -c ${pw_full_command_line[*]} &
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#Author: Castro-Fidel (PortWINE-Linux.ru)
|
#Author: Castro-Fidel (PortWINE-Linux.ru)
|
||||||
#SCRIPTS_NEXT_VERSION=2109
|
#SCRIPTS_NEXT_VERSION=2110
|
||||||
########################################################################
|
########################################################################
|
||||||
export PW_MANGOHUD=0
|
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
|
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
|
||||||
@ -24,7 +24,8 @@ export WINEARCH="win64"
|
|||||||
export PW_LIBS_VER="_v31"
|
export PW_LIBS_VER="_v31"
|
||||||
export PORTWINE_URL="https://portwine-linux.ru/"
|
export PORTWINE_URL="https://portwine-linux.ru/"
|
||||||
export GDK_BACKEND="x11"
|
export GDK_BACKEND="x11"
|
||||||
export PW_USE_GSTREAMER="1"
|
export PW_USE_GSTREAMER=1
|
||||||
|
export PW_USE_D3D_EXTRAS=0
|
||||||
export PW_PREFIX_NAME="DEFAULT"
|
export PW_PREFIX_NAME="DEFAULT"
|
||||||
export WINE_WIN_START="start.exe /i /unix"
|
export WINE_WIN_START="start.exe /i /unix"
|
||||||
export PW_USE_SHADER_CACHE=1
|
export PW_USE_SHADER_CACHE=1
|
||||||
@ -37,7 +38,7 @@ export PW_PLUGINS_VER="_v5"
|
|||||||
export PW_STEAM_VER="7.0-2"
|
export PW_STEAM_VER="7.0-2"
|
||||||
export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}"
|
export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}"
|
||||||
###WINE_PROTON_GE###
|
###WINE_PROTON_GE###
|
||||||
export PW_GE_VER="7-19"
|
export PW_GE_VER="7-20"
|
||||||
export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
|
export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
|
||||||
export PW_WINE_FULLSCREEN_FSR=0
|
export PW_WINE_FULLSCREEN_FSR=0
|
||||||
###WINE_PROTON_PW_FOR_GALLIUM_NINE###
|
###WINE_PROTON_PW_FOR_GALLIUM_NINE###
|
||||||
|
Loading…
Reference in New Issue
Block a user