From d7da035585ba4c23582a494903a6d2d964527aac7e826df3ddbf26546c827a58 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 25 Nov 2018 08:48:41 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=561

---
 _service                      |  2 +-
 wine-d3d9-patches-3.17.tar.xz |  3 ---
 wine-d3d9-patches-3.20.tar.xz |  3 +++
 wine-staging-3.20.tar.xz      |  3 ---
 wine-staging-3.21.tar.xz      |  3 +++
 wine.spec                     |  4 ++--
 winetricks                    | 19 +++++++++++++++++++
 7 files changed, 28 insertions(+), 9 deletions(-)
 delete mode 100644 wine-d3d9-patches-3.17.tar.xz
 create mode 100644 wine-d3d9-patches-3.20.tar.xz
 delete mode 100644 wine-staging-3.20.tar.xz
 create mode 100644 wine-staging-3.21.tar.xz

diff --git a/_service b/_service
index 7a5f097..ff99cbf 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">wined3d9(.*)</param>
     <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param>
-    <param name="revision">refs/tags/wine-d3d9-3.17</param>
+    <param name="revision">refs/tags/wine-d3d9-3.20</param>
     <param name="scm">git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/wine-d3d9-patches-3.17.tar.xz b/wine-d3d9-patches-3.17.tar.xz
deleted file mode 100644
index 13712a9..0000000
--- a/wine-d3d9-patches-3.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58528d0473c8c6ac1382216cb4b2030141e0955ea23543c874b13a8f54595193
-size 42268
diff --git a/wine-d3d9-patches-3.20.tar.xz b/wine-d3d9-patches-3.20.tar.xz
new file mode 100644
index 0000000..13b88d3
--- /dev/null
+++ b/wine-d3d9-patches-3.20.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:224e40f5490b17e5d0149ed7c748ccf37f716241fc61e33ee4b00bad411dcc8d
+size 42292
diff --git a/wine-staging-3.20.tar.xz b/wine-staging-3.20.tar.xz
deleted file mode 100644
index 218bf93..0000000
--- a/wine-staging-3.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc0f5df4d3510bbf117c78be6696779af7114d8723bd04b4fa85ca2c30ca1435
-size 7474356
diff --git a/wine-staging-3.21.tar.xz b/wine-staging-3.21.tar.xz
new file mode 100644
index 0000000..c167224
--- /dev/null
+++ b/wine-staging-3.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eaa08ac8abd5d9329eb6ea831623ccbc9d5857895ab66a937eb8495d4cc296b2
+size 7469036
diff --git a/wine.spec b/wine.spec
index ba69228..0bc05a0 100644
--- a/wine.spec
+++ b/wine.spec
@@ -146,7 +146,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc %arm aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 3.20
+%define staging_version 3.21
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
@@ -154,7 +154,7 @@ BuildRequires:  libva-devel
 %endif
 %if %{nine}
 # upstream patch target version
-%define nine_version 3.17
+%define nine_version 3.20
 BuildRequires:  Mesa-libd3d-devel
 BuildRequires:  libOSMesa-devel
 BuildRequires:  pkgconfig(dri2proto)
diff --git a/winetricks b/winetricks
index ea8f503..06ab293 100644
--- a/winetricks
+++ b/winetricks
@@ -7089,6 +7089,25 @@ load_dxvk92()
     helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
 }
 
+w_metadata dxvk93 dlls \
+    title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.93)" \
+    publisher="Philip Rebohle" \
+    year="2018" \
+    media="download" \
+    file1="dxvk-0.93.tar.gz" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/d3d10.dll" \
+    installed_file2="$W_SYSTEM32_DLLS_WIN/d3d10_1.dll" \
+    installed_file3="$W_SYSTEM32_DLLS_WIN/d3d10core.dll" \
+    installed_file4="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+    installed_file5="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+
+load_dxvk93()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.93/dxvk-0.93.tar.gz" 4d964e4e10e67ba7705312496e472ae9859520a78d8742d6d377886318c95e53
+    helper_dxvk "$file1" "d3d10_enabled" "3.19" "1.1.88"
+}
+
 
 #----------------------------------------------------------------