From 62005d5bde360452751fc57251026da67bfb3261 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Sun, 18 Dec 2022 23:19:08 +0300 Subject: [PATCH] Scripts version 2152 --- data_from_portwine/changelog_eng | 11 ++++++ data_from_portwine/changelog_rus | 14 ++++++++ data_from_portwine/scripts/functions_helper | 2 +- .../scripts/portwine_db/Death Stranding | 2 +- .../scripts/portwine_db/death_stranding | 35 ------------------- .../scripts/portwine_db/witcher2 | 1 - .../scripts/portwine_db/witcher3 | 6 ++-- data_from_portwine/scripts/runlib | 18 ++++++---- data_from_portwine/scripts/start.sh | 4 +-- data_from_portwine/scripts/var | 15 ++++---- 10 files changed, 52 insertions(+), 56 deletions(-) delete mode 100755 data_from_portwine/scripts/portwine_db/death_stranding diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index a31918b0..b683f3e0 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,17 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2152### +* added installation of the game Path of Exile +* updated versions of GIT DXVK and VKD3D: + DXVK_GIT_VER="2.0-34" + VKD3D_GIT_VER="1.1-3088" +* added vkbasalt unexpected shutdown when building GIT versions of DXVK and VKD3D (temporarily) +* libs_v34 (updated container and created a prefix template transfer plugin from a directory in the libs directory) + pressure vessel 0.20221130.0 + sniper 0.20221130.0 +* updated FAKE_DLSS version to 091122 + ###Scripts version 2151### * added Panzar diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index c12b2cd6..c7901316 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,20 @@ ----------------------------------------- История изменений: +###Scripts version 2152### +* обновлен шаблон дял создания префикса (улучшено отобраение кирилицы в некоторых приложениях, например Path of Exile) +* добавлена установка игры Path of Exile +* обновлены GIT версии DXVK и VKD3D: + DXVK_GIT_VER="2.0-34" + VKD3D_GIT_VER="1.1-3088" +* добавлено автоматическое отключение vkbasalt при использовании GIT версий DXVK и VKD3D (временно) +* libs_v34 (обновлен контейнер и произведен перенос шаблона префикса из каталога plugin в каталог libs) + pressure-vessel 0.20221130.0 + sniper 0.20221130.0 + для экономии места, шаблон default_pfx запакован в архив +* обновлена версия FAKE_DLSS до 091122 +* обновлена поддержка DLSS для видеокарт NVIDIA серии RTX (требуется проверка) + ###Scripts version 2151### * добавлена установка игры Panzar - Российская клиентская сессионная многопользовательская онлайн-игра 3D MMO, сочетающий в себе несколько жанров,из RPG, MOBA и шутеров от отечественных разработчиков Panzar Studio (спасибо chal55rus) + бонус: улучшенная из коробки графика в игре с помощью vkbasalt diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 514e6d30..b982db61 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -427,7 +427,7 @@ pw_init_runtime () { fi export PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=0 - export PRESSURE_VESSEL_GRAPHICS_PROVIDER="/" + # export PRESSURE_VESSEL_GRAPHICS_PROVIDER="/" unset PRESSURE_VESSEL_RUNTIME_ARCHIVE export PRESSURE_VESSEL_COPY_RUNTIME=1 diff --git a/data_from_portwine/scripts/portwine_db/Death Stranding b/data_from_portwine/scripts/portwine_db/Death Stranding index 730236c4..0d4c0b61 100755 --- a/data_from_portwine/scripts/portwine_db/Death Stranding +++ b/data_from_portwine/scripts/portwine_db/Death Stranding @@ -3,6 +3,6 @@ #ds.exe #Rating=5 ################################################ -export PW_VULKAN_USE=vkd3d +export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="" export WINEDLLOVERRIDES="d3dcompiler_47,dxcompiler=n,b" diff --git a/data_from_portwine/scripts/portwine_db/death_stranding b/data_from_portwine/scripts/portwine_db/death_stranding deleted file mode 100755 index 7d9ce173..00000000 --- a/data_from_portwine/scripts/portwine_db/death_stranding +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -#Author: -#ds.exe -#Rating=5 -################################################ -export PW_VULKAN_USE="2" -export LAUNCH_PARAMETERS="" -export WINEDLLOVERRIDES="d3dcompiler_47,dxcompiler=n,b" -export PW_WINE_USE="PROTON_GE_7-9" -export PW_PREFIX_NAME="DEFAULT" -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_VULKAN_NO_ASYNC="0" -export PW_USE_NVAPI_AND_DLSS="0" -export PW_OLD_GL_STRING="0" -export PW_HIDE_NVIDIA_GPU="0" -export PW_FORCE_USE_VSYNC="0" -export PW_VIRTUAL_DESKTOP="0" -export PW_WINEDBG_DISABLE="1" -export PW_USE_TERMINAL="0" -export PW_WINE_ALLOW_XIM="0" -export PW_HEAP_DELAY_FREE="0" -export PW_GUI_DISABLED_CS="0" -export PW_USE_GSTREAMER="1" -export PW_USE_GAMEMODE="1" -export PW_DX12_DISABLE="0" -export PW_PRIME_RENDER_OFFLOAD="0" -export PW_D3D_EXTRAS_DISABLE="0" -export PW_FIX_VIDEO_IN_GAME="1" -export PW_WINDOWS_VER="10" -export PW_DLL_INSTALL="" diff --git a/data_from_portwine/scripts/portwine_db/witcher2 b/data_from_portwine/scripts/portwine_db/witcher2 index 87816012..3574dffc 100755 --- a/data_from_portwine/scripts/portwine_db/witcher2 +++ b/data_from_portwine/scripts/portwine_db/witcher2 @@ -8,7 +8,6 @@ ##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_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 ##export PW_DXR_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN diff --git a/data_from_portwine/scripts/portwine_db/witcher3 b/data_from_portwine/scripts/portwine_db/witcher3 index 22c4037d..eb67bda2 100755 --- a/data_from_portwine/scripts/portwine_db/witcher3 +++ b/data_from_portwine/scripts/portwine_db/witcher3 @@ -8,8 +8,7 @@ ##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_WINE_USE=PROTON_GE -export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL +export PW_VULKAN_USE=2 # dxvk, vkd3d or 0 for OpenGL export PW_VULKAN_NO_ASYNC=0 ##export PW_NVAPI_DISABLE=1 export PW_OLD_GL_STRING=0 @@ -18,7 +17,7 @@ export PW_FORCE_USE_VSYNC=0 export PW_VIRTUAL_DESKTOP=0 ##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue ##export ENABLE_VKBASALT=1 -export PW_VKBASALT_FFX_CAS="0.5" +# export PW_VKBASALT_FFX_CAS="0.5" export PW_NO_FSYNC=0 export PW_NO_ESYNC=1 ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games @@ -30,6 +29,5 @@ export PW_WINE_ALLOW_XIM=0 export PW_WINEDBG_DISABLE=0 export PW_USE_TERMINAL=0 ##ADD_IN_START_PORTWINE () { commands ; } -export PW_WINE_USE=PROTON_GE export PW_USE_NVAPI_AND_DLSS=0 export PW_GUI_DISABLED_CS=0 diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 8d995991..97165fd6 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -125,6 +125,8 @@ start_portwine () { try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/" enabled_fake_nvidia_videocard 1 export DXVK_NVAPIHACK=0 + export DXVK_ENABLE_NVAPI=1 + export WINE_HIDE_NVIDIA_GPU=0 elif [[ ! -z "${PW_USE_NVAPI_AND_DLSS}" && "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] && [[ -d "${WINEDIR}/lib/wine/nvapi/" ]] then try_force_link_file "${PW_PLUGINS_PATH}/nvapi/x32/nvapi.dll" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/" @@ -139,11 +141,14 @@ start_portwine () { try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/syswow64/nvml.dll" try_force_link_file "${PW_PLUGINS_PATH}"/nvml/lib64/wine/nvml.dll.so "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/system32/nvml.dll" export DXVK_NVAPIHACK=0 + export DXVK_ENABLE_NVAPI=1 + export WINE_HIDE_NVIDIA_GPU=0 enabled_fake_nvidia_videocard 0 else - var_winedlloverride_update "nvapi,nvapi64,nvml,nvngx,nvcuda=" enabled_fake_nvidia_videocard 0 export DXVK_NVAPIHACK=1 + export DXVK_ENABLE_NVAPI=0 + export WINE_HIDE_NVIDIA_GPU=1 fi if [[ ! -z "${PW_PRIME_RENDER_OFFLOAD}" && "${PW_PRIME_RENDER_OFFLOAD}" != 0 ]] ; then @@ -265,14 +270,14 @@ start_portwine () { pw_update_pfx_cover_gui - if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows || \ - ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/userdef.reg || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/system.reg || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/user.reg ]] + ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/userdef.reg || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/system.reg || \ + ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/user.reg ]] then pw_clear_pfx check_dirs_and_files_in_pfx - if [[ -d "${PW_PLUGINS_PATH}/default_pfx/" ]] ; then - cp -frL "${PW_PLUGINS_PATH}/default_pfx/"* "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" + if [[ -f "${PW_WINELIB}/default_pfx.tar.xz" ]] ; 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" wait_wineserver && @@ -328,7 +333,7 @@ start_portwine () { if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" fi - var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;lsteamclient,winemenubuilder.exe=" + var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;lsteamclient,winemenubuilder.exe=d" # export TOTAL_VRAM=`"${PW_WINELIB}/runtime/files/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` # echo "TOTAL_VRAM=${TOTAL_VRAM}" @@ -407,6 +412,7 @@ 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 diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index b1500856..9687b55c 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -704,9 +704,9 @@ else --field=" Crossout"!"$PW_GUI_ICON_PATH/crossout.png"!"":"FBTN" '@bash -c "button_click PW_CROSSOUT"' \ --field=" Indiegala Client"!"$PW_GUI_ICON_PATH/igclient.png"!"":"FBTN" '@bash -c "button_click PW_IGCLIENT"' \ --field=" Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click PW_WARFRAME"' \ - --field=" Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click PW_PANZAR"' & + --field=" Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click PW_PANZAR"' \ + --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' & - # --field=" Path of Exile (TEST)"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' # --field=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 5c100d7e..e621477a 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=2151 +#SCRIPTS_NEXT_VERSION=2152 ######################################################################## 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="_v33" +export PW_LIBS_VER="_v35" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -31,8 +31,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="_v8" -export PW_FAKE_DLSS_VER="051022" +export PW_PLUGINS_VER="_v9" +export PW_FAKE_DLSS_VER="091122" ###WINE_PROTON_LG### export PW_LG_VER="7-34" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" @@ -42,9 +42,9 @@ export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_WINE_FULLSCREEN_FSR="0" ###DXVK_AND_VKD3D### export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.0-26" +export DXVK_GIT_VER="2.0-34" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-2967" +export VKD3D_GIT_VER="1.1-3088" ###PREFIX_VERSION### export DOTPFX_VER="48v1" export DEFPFX_VER="v1" @@ -89,3 +89,6 @@ pw_other_fixes () fi fi } + +# export VKD3D_FEATURE_LEVEL=12_0 +# export WINE_DISABLE_VULKAN_OPWR=1