diff --git a/data_from_portwine/scripts/winetricks b/data_from_portwine/scripts/winetricks index b0b5db69..4abb30e6 100755 --- a/data_from_portwine/scripts/winetricks +++ b/data_from_portwine/scripts/winetricks @@ -8117,6 +8117,24 @@ load_dxvk161() helper_dxvk_d9vk "$file1" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d11" } +w_metadata dxvk170 dlls \ + title="Vulkan-based D3D9/D3D10/D3D11 implementation for Linux / Wine (1.7)" \ + publisher="Philip Rebohle" \ + year="2017" \ + media="download" \ + file1="dxvk-1.7.tar.gz" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3d9.dll" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \ + installed_file3="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \ + installed_file4="$W_SYSTEM32_DLLS_WIN/dxgi.dll" + +load_dxvk170() +{ + # https://github.com/doitsujin/dxvk + w_download "https://github.com/doitsujin/dxvk/releases/download/v1.7/dxvk-1.7.tar.gz" 67d78239906c24bd50a5ecbc2fd792c1721e274a7a60dd22f74b21b08ca4c7a1 + helper_dxvk_d9vk "$file1" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11" +} + #---------------------------------------------------------------- w_metadata dxvk dlls \ @@ -8135,7 +8153,7 @@ load_dxvk() _W_dxvk_version="$(w_get_github_latest_release doitsujin dxvk)" _W_dxvk_version="${_W_dxvk_version#v}" w_linkcheck_ignore=1 w_download "https://github.com/doitsujin/dxvk/releases/download/v${_W_dxvk_version}/dxvk-${_W_dxvk_version}.tar.gz" - helper_dxvk_d9vk "dxvk-${_W_dxvk_version}.tar.gz" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d11" + helper_dxvk_d9vk "dxvk-${_W_dxvk_version}.tar.gz" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11" unset _W_dxvk_version } @@ -8160,7 +8178,7 @@ load_dxvk_master() w_try rm -f "${W_CACHE}/${W_PACKAGE}/${file1}" fi w_linkcheck_ignore=1 w_download_to "${W_CACHE}/${W_PACKAGE}" "https://git.froggi.es/doitsujin/dxvk/-/jobs/artifacts/master/download?job=dxvk" "" "dxvk_master.zip" - helper_dxvk_d9vk "$file1" "5.3" "1.1.113" "dxgi,d3d9,d3d10core,d3d11" + helper_dxvk_d9vk "$file1" "5.8" "1.2.140" "dxgi,d3d9,d3d10core,d3d11" } #---------------------------------------------------------------- @@ -12567,7 +12585,8 @@ load_vcrun2019() # https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads # 2019/12/26: e59ae3e886bd4571a811fe31a47959ae5c40d87c583f786816c60440252cd7ec # 2020/03/23: ac96016f1511ae3eb5ec9de04551146fe351b7f97858dcd67163912e2302f5d6 - w_download https://aka.ms/vs/16/release/vc_redist.x86.exe ac96016f1511ae3eb5ec9de04551146fe351b7f97858dcd67163912e2302f5d6 + # 2020/05/20: a06aac66734a618ab33c1522920654ddfc44fc13cafaa0f0ab85b199c3d51dc0 + w_download https://aka.ms/vs/16/release/vc_redist.x86.exe a06aac66734a618ab33c1522920654ddfc44fc13cafaa0f0ab85b199c3d51dc0 w_override_dlls native,builtin api-ms-win-crt-private-l1-1-0 api-ms-win-crt-conio-l1-1-0 api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 api-ms-win-crt-time-l1-1-0 atl140 concrt140 msvcp140 msvcr140 ucrtbase vcomp140 vcruntime140 @@ -12579,7 +12598,8 @@ load_vcrun2019() # Also install the 64-bit version # 2019/12/26: 40ea2955391c9eae3e35619c4c24b5aaf3d17aeaa6d09424ee9672aa9372aeed # 2020/03/23: b6c82087a2c443db859fdbeaae7f46244d06c3f2a7f71c35e50358066253de52 - w_download https://aka.ms/vs/16/release/vc_redist.x64.exe b6c82087a2c443db859fdbeaae7f46244d06c3f2a7f71c35e50358066253de52 + # 2020/05/20: 7d7105c52fcd6766beee1ae162aa81e278686122c1e44890712326634d0b055e + w_download https://aka.ms/vs/16/release/vc_redist.x64.exe 7d7105c52fcd6766beee1ae162aa81e278686122c1e44890712326634d0b055e w_try "$WINE" vc_redist.x64.exe ${W_OPT_UNATTENDED:+/q} ;; esac @@ -16305,7 +16325,7 @@ load_wmp9() w_try cabextract -d "$W_TMP" ./MPSetup.exe w_try_cd "$W_TMP" w_try sed -i 's/IsWow64Process/IsNow64Process/' setup_wm.exe - w_try "$WINE" setup_wm.exe ${W_OPT_UNATTENDED:+/quiet} + w_try "$WINE" setup_wm.exe ${W_OPT_UNATTENDED:+/Quiet} else w_try "$WINE" MPSetup.exe ${W_OPT_UNATTENDED:+/q} fi