From 00c79a3c3d1db5331928b2e87aa5c0482ed31c29 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 28 Dec 2023 23:43:44 +0300 Subject: [PATCH] Scripts version 2241 --- data_from_portwine/changelog_eng | 3 +++ data_from_portwine/changelog_rus | 3 +++ data_from_portwine/scripts/runlib | 32 ++++++++++++------------------- data_from_portwine/scripts/var | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index d142930..40027fe 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2241### Date: 28.12.2023 / Download update size: 8 megabytes +* HOTFIX - VKD3D + ###Scripts version 2240### Date: 28.12.2023 / Download update size: 8 megabytes * the variable "DX12_DISABLE" has been removed from EDIT_DB (deprecated function) * Vulkan driver verification has been transferred to the log creation mode diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index de12fe4..b188917 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2241### Дата: 28.12.2023 / Размер скачиваемого обновления: 8 мегабайт +* HOTFIX - VKD3D (определение DX12 в некоторых играх) + ###Scripts version 2240### Дата: 28.12.2023 / Размер скачиваемого обновления: 8 мегабайт * удалена переменная "DX12_DISABLE" из EDIT_DB (устаревшая функция) * произведен перенос проверки драйвера Vulkan в режим создания лога diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index f99d2a0..ddd18a7 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -430,25 +430,14 @@ start_portwine () { fi done fi - print_info "Try link wine DXGI by default..." - if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll" - then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll" - fi - if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" - then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" - fi - print_info "Try link wine d3d filese by default..." - for rm_vulkan_dll in libvkd3d-1 libvkd3d-shader-1 dxvk_config nvapi nvapi64 ; do - try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" - try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" + print_info "Try link wine d3d files by default..." + for rm_vulkan_dll in libvkd3d-1 libvkd3d-shader-1 dxvk_config nvapi nvapi64 d3d12core d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d ; do + try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${rm_vulkan_dll}.dll" + try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${rm_vulkan_dll}.dll" done for wine_build_dll in d3d12core d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d ; do - if ! try_force_link_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" - then try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" - fi - if ! try_force_link_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" - then try_force_link_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" - fi + try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" + try_force_link_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_build_dll}.dll" done create_new_dir "${PW_VULKAN_DIR}/opengl" @@ -527,9 +516,11 @@ start_portwine () { print_info "Try link native DXVK files..." for wine_dxvk_dll in ${CP_DXVK_FILES} ; do - try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" - try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" - [[ "$?" == 0 ]] && var_winedlloverride_update "${wine_dxvk_dll}=n" + if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" ]] ; then + try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" + try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" + var_winedlloverride_update "${wine_dxvk_dll}=n" + fi done try_force_link_file "${PATH_TO_DXVK_FILES}/x32/nvapi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" || \ @@ -545,6 +536,7 @@ start_portwine () { if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" + var_winedlloverride_update "${wine_vkd3d_dll}=n" fi done diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 794e3da..f69bd9d 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=2240 +#SCRIPTS_NEXT_VERSION=2241 ######################################################################## 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