diff --git a/_service b/_service
index 7f4e915..4fa0f3e 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
@PARENT_TAG@
v(.*)
https://github.com/wine-staging/wine-staging.git
- refs/tags/v3.10
+ refs/tags/v3.11
v*.*
git
diff --git a/wine-staging-3.10.tar.xz b/wine-staging-3.10.tar.xz
deleted file mode 100644
index bd86a08..0000000
--- a/wine-staging-3.10.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a06a9ded4ef870bbdd6cc9e82071b5d0823fba92e5c8505aec5051ae5943d95
-size 7525300
diff --git a/wine-staging-3.11.tar.xz b/wine-staging-3.11.tar.xz
new file mode 100644
index 0000000..77887de
--- /dev/null
+++ b/wine-staging-3.11.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8261dd7f6b5c678461fb1d857b5ad11a39196472eabb63c9602553b18befb101
+size 7530952
diff --git a/wine.changes b/wine.changes
index eae0a88..bcac244 100644
--- a/wine.changes
+++ b/wine.changes
@@ -8,6 +8,7 @@ Sat Jun 23 06:30:49 UTC 2018 - meissner@suse.com
- Improvements to the standard Task Dialog.
- Various bug fixes.
- updated winetricks
+- updated staging to 3.11
-------------------------------------------------------------------
Wed Jun 20 14:00:19 UTC 2018 - meissner@suse.com
diff --git a/wine.spec b/wine.spec
index 2ca69f8..99a95d2 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.10
+%define staging_version 3.11
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
diff --git a/winetricks b/winetricks
index d195465..e7c4176 100644
--- a/winetricks
+++ b/winetricks
@@ -6605,23 +6605,28 @@ load_dxsdk_jun2010()
#----------------------------------------------------------------
-w_metadata dxvk dlls \
- title="Vulkan-based D3D11 implementation for Linux / Wine" \
- publisher="Philip Rebohle" \
- year="2018" \
- media="download" \
- file1="dxvk-0.54.tar.gz" \
- installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
- installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
-
-load_dxvk()
+# $1 - dxvk archive name (required)
+# $2 - minimum Wine version (optional)
+# $3 - minimum Vulkan API version (optional, requires $2 be set)
+helper_dxvk()
{
- _W_dxvk_dir="${file1%.tar.gz}"
+ _W_dxvk_archive="${1}"
+ _W_min_wine_version="${2}"
+ _W_min_vulkan_version="${3}"
+
+ _W_dxvk_dir="${_W_dxvk_archive%.tar.gz}"
+ _W_dxvk_version="${_W_dxvk_dir#*-}"
+
+ w_warn "Please refer to dxvk version ${_W_dxvk_version} release notes... See: https://github.com/doitsujin/dxvk/releases/tag/v${_W_dxvk_version}"
+ if [ ! -z "$_W_min_wine_version" ] && ! w_wine_version_in ",${_W_min_wine_version}" ; then
+ [ -z "$_W_min_vulkan_version" ] || _W_vulkan_info=" The base requirement is Vulkan $_W_min_vulkan_version API support."
+ w_warn "dxvk ${_W_dxvk_version} does not support wine version ${_wine_version_stripped}. dxvk ${_W_dxvk_version} requires wine version ${_W_min_wine_version} (or newer).${_W_vulkan_info}"
+ unset _W_vulkan_info
+ fi
+ w_warn "Please refer to current dxvk base graphics driver requirements... See: https://github.com/doitsujin/dxvk/wiki/Driver-support"
- # https://github.com/doitsujin/dxvk
- w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
w_try_cd "$W_TMP"
- w_try tar -zxf "$W_CACHE/$W_PACKAGE/$file1"
+ w_try tar -zxf "$W_CACHE/$W_PACKAGE/$_W_dxvk_archive"
w_try mv "$W_TMP/$_W_dxvk_dir/x32/d3d11.dll" "$W_SYSTEM32_DLLS/"
w_try mv "$W_TMP/$_W_dxvk_dir/x32/dxgi.dll" "$W_SYSTEM32_DLLS/"
if test "$W_ARCH" = "win64"; then
@@ -6630,7 +6635,59 @@ load_dxvk()
fi
w_override_dlls native d3d11 dxgi
- unset _W_dxvk_dir
+ unset _W_dxvk_archive _W_dxvk_dir _W_dxvk_version _W_min_vulkan_version _W_min_wine_version
+}
+
+#----------------------------------------------------------------
+
+w_metadata dxvk54 dlls \
+ title="Vulkan-based D3D11 implementation for Linux / Wine (0.54)" \
+ publisher="Philip Rebohle" \
+ year="2018" \
+ media="download" \
+ file1="dxvk-0.54.tar.gz" \
+ installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \
+ installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll"
+
+load_dxvk54()
+{
+ # https://github.com/doitsujin/dxvk
+ w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640
+ helper_dxvk "$file1"
+}
+
+#----------------------------------------------------------------
+
+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" ece9286ebe75aab4c585b8aeb5040b36982db3c54f5d59be76b2e89e8edde10e
+ helper_dxvk "$file1" "3.10" "1.0.76"
+}
+
+#----------------------------------------------------------------
+
+w_metadata dxvk dlls \
+ title="Vulkan-based D3D11 implementation for Linux / Wine (latest)" \
+ 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_dxvk()
+{
+ w_call dxvk60
}
#----------------------------------------------------------------