From 41629d4d148dcfdfee5f4078b70246213a015d18 Mon Sep 17 00:00:00 2001
From: survolog <survolog@yandex.ru>
Date: Wed, 4 Jul 2018 19:46:28 +0300
Subject: [PATCH] Moved dxvk to winetricks

---
 README.urpmi                       |  4 ++--
 winetricks-20180603-add-dxvk.patch | 32 +++++++-----------------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/README.urpmi b/README.urpmi
index 2a2ec84..4991962 100644
--- a/README.urpmi
+++ b/README.urpmi
@@ -1,9 +1,9 @@
 In order to set up DXVK (DirectX11->Vulkan) to wine
-instead of wined3d globally, run in terminal winetricks dxvk54
+instead of wined3d globally, run in terminal winetricks dxvk
 For return to wined3d configure d3d11 and dxgi in the tab 'Libraries' of winecfg.
 
 === Russian ===
 
 Для того, чтобы установить DXVK (DirectX11->Vulkan) в wine вместо
-wined3d для всех приложений, запустите в терминале winetricks dxvk54
+wined3d для всех приложений, запустите в терминале winetricks dxvk
 Для возврата к wined3d настройте d3d11 и dxgi во вкладке "Библиотеки" winecfg.
diff --git a/winetricks-20180603-add-dxvk.patch b/winetricks-20180603-add-dxvk.patch
index aa8819f..7b7cc06 100644
--- a/winetricks-20180603-add-dxvk.patch
+++ b/winetricks-20180603-add-dxvk.patch
@@ -1,5 +1,5 @@
---- winetricks	2018-06-19 20:30:46.860787127 +0300
-+++ winetricks_patched	2018-07-04 18:28:33.660136627 +0300
+--- winetricks	2018-07-04 19:17:43.787798000 +0300
++++ winetricks_patched	2018-07-04 19:31:41.167702118 +0300
 @@ -4821,10 +4821,16 @@
          # WINE64 = wine64, available on 64-bit prefixes
          # WINE_ARCH = the native wine for the prefix (wine for 32-bit, wine64 for 64-bit)
@@ -21,7 +21,7 @@
          WINE_ARCH="${WINE64}"
          WINE_MULTI="${WINE}"
  
-@@ -6475,6 +6481,93 @@
+@@ -6475,6 +6481,75 @@
  
  #----------------------------------------------------------------
  
@@ -78,36 +78,18 @@
 +
 +#----------------------------------------------------------------
 +
-+w_metadata dxvk60 dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (0.60)" \
-+    publisher="Philip Rebohle" \
-+    year="2018" \
-+    media="download" \
-+    file1="dxvk-0.60.tar.gz" \
-+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
-+    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-+
-+load_dxvk60()
-+{
-+    # https://github.com/doitsujin/dxvk
-+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.60/dxvk-0.60.tar.gz" 27d6f700241d3ec3b6c002c3d739bb0e3f210ec916ecb5a62d9204e9e50f2c4a
-+    helper_dxvk "$file1" "3.10" "1.0.76"
-+}
-+
-+#----------------------------------------------------------------
-+
 +w_metadata dxvk dlls \
-+    title="Vulkan-based D3D11 implementation for Linux / Wine (latest)" \
++    title="Vulkan-based D3D11 implementation for Linux / Wine (checked)" \
 +    publisher="Philip Rebohle" \
 +    year="2018" \
 +    media="download" \
-+    file1="dxvk-0.60.tar.gz" \
++    file1="dxvk-0.54.tar.gz" \
 +    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
 +    installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
 +
 +load_dxvk()
 +{
-+    w_call dxvk60
++    w_call dxvk54
 +}
 +
 +#----------------------------------------------------------------
@@ -115,7 +97,7 @@
  w_metadata dmusic32 dlls \
      title="MS dmusic32.dll from DirectX user redistributable" \
      publisher="Microsoft" \
-@@ -9919,14 +10012,36 @@
+@@ -9919,14 +9994,36 @@
      year="2018" \
      media="download" \
      file1="VulkanSDK-1.1.73.0-Installer.exe" \