From 301b4f03d5842fe7fb18fefb754bfded882d606f356e65f603f26a4e3fe5577a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 3 Sep 2018 09:37:25 +0000
Subject: [PATCH] - updated staging to 3.15

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=539
---
 _service                      |  2 +-
 wine-d3d9-patches-3.13.tar.xz |  3 ---
 wine-d3d9-patches-3.15.tar.xz |  3 +++
 wine-staging-3.14.tar.xz      |  3 ---
 wine-staging-3.15.tar.xz      |  3 +++
 wine.changes                  |  1 +
 wine.spec                     |  4 ++--
 winetricks                    | 19 +++++++++++++++++++
 8 files changed, 29 insertions(+), 9 deletions(-)
 delete mode 100644 wine-d3d9-patches-3.13.tar.xz
 create mode 100644 wine-d3d9-patches-3.15.tar.xz
 delete mode 100644 wine-staging-3.14.tar.xz
 create mode 100644 wine-staging-3.15.tar.xz

diff --git a/_service b/_service
index 2ad3dbd..88a62c4 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.14</param>
+    <param name="revision">refs/tags/wine-d3d9-3.15</param>
     <param name="scm">git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/wine-d3d9-patches-3.13.tar.xz b/wine-d3d9-patches-3.13.tar.xz
deleted file mode 100644
index 5f8ce5a..0000000
--- a/wine-d3d9-patches-3.13.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b0cee2121d14fc812fe88539a06604de33bb1251962e3126e0aaf6366a5dae4
-size 42272
diff --git a/wine-d3d9-patches-3.15.tar.xz b/wine-d3d9-patches-3.15.tar.xz
new file mode 100644
index 0000000..047c693
--- /dev/null
+++ b/wine-d3d9-patches-3.15.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:991b15e36619a848b2f36aeaf6ac741269333c82217f6394bc940e79b19764ab
+size 42272
diff --git a/wine-staging-3.14.tar.xz b/wine-staging-3.14.tar.xz
deleted file mode 100644
index fc48ad0..0000000
--- a/wine-staging-3.14.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ce10521e11628f141e6da4d91b84fb7fa3ac1f8fc8d73a66c0f50508f4efbb3
-size 7520156
diff --git a/wine-staging-3.15.tar.xz b/wine-staging-3.15.tar.xz
new file mode 100644
index 0000000..43ba3ff
--- /dev/null
+++ b/wine-staging-3.15.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c4767e602a4bd23a7ab22845df6920e7d86776d29281c115556292699ec4955
+size 7522760
diff --git a/wine.changes b/wine.changes
index 44f3a58..578c9fb 100644
--- a/wine.changes
+++ b/wine.changes
@@ -8,6 +8,7 @@ Sat Sep  1 06:17:50 UTC 2018 - meissner@suse.com
   - WinHTTP converted to use Windows Sockets.
   - Syntax fixes in the command line interpreter.
   - Various bug fixes.
+- updated staging to 3.15
 - updated winetricks
 
 -------------------------------------------------------------------
diff --git a/wine.spec b/wine.spec
index 868b7fc..f167aeb 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.14
+%define staging_version 3.15
 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.13
+%define nine_version 3.15
 BuildRequires:  Mesa-libd3d-devel
 BuildRequires:  libOSMesa-devel
 BuildRequires:  pkgconfig(dri2proto)
diff --git a/winetricks b/winetricks
index 03ae0e3..ab0f63f 100644
--- a/winetricks
+++ b/winetricks
@@ -6829,6 +6829,25 @@ load_dxvk70()
     helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76"
 }
 
+w_metadata dxvk71 dlls \
+    title="Vulkan-based D3D10/D3D11 implementation for Linux / Wine (0.71)" \
+    publisher="Philip Rebohle" \
+    year="2018" \
+    media="download" \
+    file1="dxvk-0.71.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_dxvk71()
+{
+    # https://github.com/doitsujin/dxvk
+    w_download "https://github.com/doitsujin/dxvk/releases/download/v0.71/dxvk-0.71.tar.gz" fbe66337d1450f366961a7699253cd7a96c12a88c2fcda64b79be1cbb13d37d5
+    helper_dxvk "$file1" "d3d10_enabled" "3.10" "1.0.76"
+}
+
 
 #----------------------------------------------------------------