diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index e5067c79..31384f8e 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,14 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2176### +* The libc_v41 library package has been updated + PROTON_LG="7-53" + PROTON_GE="7-53" + DXVK_GIT_VER="2.1-48" + VKD3D_GIT_VER="1.1-3325" +* updated the vkBasalt version to work with the latest versions of DXVK and VKD3D (thanks to Vuursteen for compiling) + ###Scripts version 2175### * Updated the list of thanks to paid subscribers on https://boosty.to/portwine-linux.ru * Thank you so much: diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 4ec5e187..acfbc332 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,18 @@ ----------------------------------------- История изменений: +###Scripts version 2176### +* Обновлен пакет библиотек libs_v41 + pressure-vessel 0.20230314.0 + sniper 0.20230314.45253 +* обновлены версии: + PROTON_LG="7-53" + PROTON_GE="7-53" + DXVK_GIT_VER="2.1-48" + VKD3D_GIT_VER="1.1-3325" +* обновлен шаблон default префикса (предустановлен VulkanRT для работы игры RDR2 - требуется тест) +* обновлена версия vkBasalt для совместной работы с новейшими версиями DXVK и VKD3D (спасибо Vuursteen за компиляцию) + ###Scripts version 2175### * Обновлен список благодарностей платным подписчикам на https://boosty.to/portwine-linux.ru * Огромное спасибо (список всех активных подписок и которые уже не подписаны на данный момент): diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index ed3d56b8..bfa63eaa 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -39,6 +39,7 @@ zorn Vano Majukin Сергей 33(46)RUS WelchDragon +Vuursteen " & "${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index 10fc2dd5..30155e3d 100755 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -10,7 +10,8 @@ export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq" export PW_DLL_INSTALL="vcrun2012 vcrun2013 vcrun2022" export PW_USE_D3D_EXTRAS=1 export PW_WINE_USE="PROTON_LG" +export WINEDLLOVERRIDES="vulkan-1=n,b" add_in_start_portwine () { - regdlloverrides "RDR2.exe:vulkan-1=n" + regdlloverrides "RDR2.exe:vulkan-1=n,b" } diff --git a/data_from_portwine/scripts/portwine_db/HogwartsLegacy b/data_from_portwine/scripts/portwine_db/HogwartsLegacy index 1ee11b86..f3ef752a 100644 --- a/data_from_portwine/scripts/portwine_db/HogwartsLegacy +++ b/data_from_portwine/scripts/portwine_db/HogwartsLegacy @@ -56,7 +56,6 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" export PW_USE_WINE_DXGI="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=48,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt" add_in_start_portwine () { if [ "${update_loc}" = "RUS" ] ; then diff --git a/data_from_portwine/scripts/portwine_db/RDR2 b/data_from_portwine/scripts/portwine_db/RDR2 index 1ad94b96..0afd85c1 100755 --- a/data_from_portwine/scripts/portwine_db/RDR2 +++ b/data_from_portwine/scripts/portwine_db/RDR2 @@ -4,9 +4,34 @@ #PlayRDR2.exe #Rating=? ################################################ -export PW_VULKAN_USE=1 -export WINEDLLOVERRIDES="vulkan-1=n" -export PW_DXGI_FROM_DXVK=1 -export LAUNCH_PARAMETERS=("-fullscreen" "-vulkan" "-adapter=1" "-USEALLAVAILABLECORES" "-cpuLoadRebalancing" "-ignorepipelinecach") -export PULSE_LATENCY_MSEC=60 -#export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" +export PW_VULKAN_USE="1" +export PW_WINE_USE="PROTON_LG" +export PW_PREFIX_NAME="DEFAULT" +export PW_MANGOHUD="0" +export PW_MANGOHUD_x32="0" +export PW_MANGOHUD_USER_CONF="0" +export ENABLE_VKBASALT="0" +export PW_NO_ESYNC="1" +export PW_NO_FSYNC="0" +export PW_USE_DXR10="0" +export PW_USE_DXR11="0" +export PW_USE_NVAPI_AND_DLSS="0" +export PW_USE_FAKE_DLSS="0" +export PW_WINE_FULLSCREEN_FSR="1" +export PW_HIDE_NVIDIA_GPU="0" +export PW_VIRTUAL_DESKTOP="0" +export PW_USE_TERMINAL="0" +export PW_GUI_DISABLED_CS="0" +export PW_USE_GAMEMODE="1" +export PW_DX12_DISABLE="0" +export PW_PRIME_RENDER_OFFLOAD="0" +export PW_USE_D3D_EXTRAS="1" +export PW_FIX_VIDEO_IN_GAME="0" +export PW_USE_GSTREAMER="1" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="1" +export PW_USE_WINE_DXGI="0" +export LAUNCH_PARAMETERS="-vulkan -fullscreen -adapter=1 -USEALLAVAILABLECORES -cpuLoadRebalancing -ignorepipelinecach" +export PW_WINDOWS_VER="10" +export PW_DLL_INSTALL="" +export WINEDLLOVERRIDES="vulkan-1=n,b" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 3c91ec57..ef870bd0 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -350,7 +350,7 @@ start_portwine () { then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/dxgi.dll" fi echo "Try link wine d3d filese by default..." - for wine_build_dll in d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do + for wine_build_dll in d3d12core d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do if ! try_force_link_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_build_dll}.dll" then try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/${wine_build_dll}.dll" fi @@ -367,7 +367,7 @@ start_portwine () { echo "Use OpenGL" export GL_YIELD="NOTHING" export mesa_glthread=true - var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12=" + var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12,d3d12core=" elif [[ "${PW_VULKAN_USE}" == "3" ]] ; then echo "Use GALLIUM-NINE (Native DX9 on MESA drivers)" export PW_GALLIUM_NINE_VER="0.8" @@ -416,7 +416,6 @@ start_portwine () { elif [[ "${PW_VULKAN_USE}" == "2" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" - export ENABLE_VKBASALT=0 # need update vkbasalt for new Vulkan 1.3 echo "DXVK v.${DXVK_GIT_VER} in use" echo "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" fi @@ -429,7 +428,7 @@ start_portwine () { done echo "Try link native VKD3D files..." - for wine_vkd3d_dll in d3d12 libvkd3d-shader-1 # libvkd3d-proton-utils-3 + for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 # libvkd3d-proton-utils-3 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" @@ -437,8 +436,8 @@ start_portwine () { fi if [[ "${PW_DX12_DISABLE}" == 1 ]] - then var_winedlloverride_update "d3d12=" - else var_winedlloverride_update "d3d12=n" + then var_winedlloverride_update "d3d12,d3d12core=" + else var_winedlloverride_update "d3d12,d3d12core=n" fi if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/vrclient/bin" ]] ; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 23dce74f..b86c8f76 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=2175 +#SCRIPTS_NEXT_VERSION=2176 ######################################################################## 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 @@ -20,7 +20,7 @@ export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v40" +export PW_LIBS_VER="_v41" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -35,17 +35,17 @@ export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v10" export PW_FAKE_DLSS_VER="091122" ###WINE_PROTON_LG### -export PW_LG_VER="7-51" +export PW_LG_VER="7-53" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" ###WINE_PROTON_GE### -export PW_GE_VER="7-51" +export PW_GE_VER="7-53" 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" +export DXVK_GIT_VER="2.1-48" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3132" +export VKD3D_GIT_VER="1.1-3325" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1"