Commit 67df25e2 authored by Mikhail Tergoev's avatar Mikhail Tergoev

Scripts version 2181

parent f6bb0005
......@@ -2,6 +2,12 @@ You can help us in the development of the project on the website: boosty.to/linu
-----------------------------------------
Changelog:
###Scripts version 2181###
* updated versions:
PROTON_GE="8-2"
DXVK_GIT_VER="2.1-79"
VKD3D_GIT_VER="1.1-3410"
###Scripts version 2180###
* updated versions: WINE_LOL_GE_7.0-8 (for League of Legend)
......
......@@ -2,6 +2,12 @@
-----------------------------------------
История изменений:
###Scripts version 2181###
* обновлены версии:
PROTON_GE="8-2"
DXVK_GIT_VER="2.1-79"
VKD3D_GIT_VER="1.1-3410"
###Scripts version 2180###
* обновлен WINE_LOL_GE_7.0-8 (League of Legend снова работает)
......
......@@ -11,3 +11,4 @@ export PW_MUST_HAVE_DLL=""
export PW_PREFIX_NAME="EA_APP"
# export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64"
# gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64"
export DISABLE_CP_DEFPFX=1
......@@ -7,6 +7,7 @@ export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetr
export PW_VULKAN_USE=1
export PW_MUST_HAVE_DLL=""
export PW_PREFIX_NAME="EA_APP"
export DISABLE_CP_DEFPFX=1
# export WINEDLLOVERRIDES="mscoree,mshtml=b"
# export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64"
# gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64"
......
......@@ -282,7 +282,7 @@ start_portwine () {
then
pw_clear_pfx
check_dirs_and_files_in_pfx
if [[ -f "${PW_WINELIB}/default_pfx.tar.xz" ]] ; then
if [[ -f "${PW_WINELIB}/default_pfx.tar.xz" ]] && [[ "${DISABLE_CP_DEFPFX}" != 1 ]] ; then
unpack_tar_xz "${PW_WINELIB}/default_pfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" 2>/dev/null
fi
${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
......@@ -306,9 +306,13 @@ start_portwine () {
then try_force_link_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/Documents" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/My Documents"
fi
#enabled BattleEye_Runtime and EasyAntiCheat_Runtime
export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/BattlEye_Runtime"
export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/EasyAntiCheat_Runtime"
var_winedlloverride_update "beclient,beclient_x64=b,n"
if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then
export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/BattlEye_Runtime"
export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/EasyAntiCheat_Runtime"
var_winedlloverride_update "beclient,beclient_x64=b,n"
else
unset PROTON_BATTLEYE_RUNTIME PROTON_EAC_RUNTIME
fi
#try link d3d extras libs
if [[ -d "${PW_PLUGINS_PATH}/d3d_extras" ]]
then PATH_TO_D3DEXTRAS="${PW_PLUGINS_PATH}/d3d_extras"
......@@ -430,7 +434,7 @@ start_portwine () {
done
echo "Try link native VKD3D files..."
for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 # libvkd3d-proton-utils-3
for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 libvkd3d-1
do
try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll"
try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/${wine_vkd3d_dll}.dll"
......@@ -438,8 +442,8 @@ start_portwine () {
fi
if [[ "${PW_DX12_DISABLE}" == 1 ]]
then var_winedlloverride_update "d3d12,d3d12core="
else var_winedlloverride_update "d3d12,d3d12core=n"
then var_winedlloverride_update "d3d12,d3d12core,libvkd3d-shader-1,libvkd3d-1="
else var_winedlloverride_update "d3d12,d3d12core,libvkd3d-shader-1,libvkd3d-1=n"
fi
if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin" ]] ; then
......
......@@ -414,7 +414,7 @@ pw_edit_db () {
PW_MANGOHUD PW_MANGOHUD_x32 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_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \
PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \
PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI
PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE
if [ "$?" == 0 ] ; then
echo "Restarting PP after update ppdb file..."
/usr/bin/env bash -c ${pw_full_command_line[*]} &
......
#!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2180
#SCRIPTS_NEXT_VERSION=2181
########################################################################
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
......@@ -30,6 +30,7 @@ export PW_USE_SHADER_CACHE="1"
export STAGING_SHARED_MEMORY="1"
export PW_FORCE_LARGE_ADDRESS_AWARE="1"
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"
......@@ -38,14 +39,14 @@ export PW_FAKE_DLSS_VER="091122"
export PW_LG_VER="7-54"
export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}"
###WINE_PROTON_GE###
export PW_GE_VER="7-54"
export PW_GE_VER="8-2"
export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
export PW_WINE_FULLSCREEN_FSR="1"
###DXVK_AND_VKD3D###
export DXVK_STABLE_VER="1.10.3-28"
export DXVK_GIT_VER="2.1-51"
export DXVK_GIT_VER="2.1-79"
export VKD3D_STABLE_VER="1.1-2602"
export VKD3D_GIT_VER="1.1-3339"
export VKD3D_GIT_VER="1.1-3410"
###PREFIX_VERSION###
export DOTPFX_VER="48v1"
export DEFPFX_VER="v1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment