[dxvk-mingw] Version 2.1

3 files changed, 15 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b45fa162b51..3ff181dd24bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dxvk-mingw
 	pkgdesc = Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine, MingW version
-	pkgver = 2.0
+	pkgver = 2.1
 	pkgrel = 1
 	url = https://github.com/doitsujin/dxvk
 	arch = x86_64
@@ -15,14 +15,15 @@ pkgbase = dxvk-mingw
 	depends = bash
 	provides = dxvk
 	provides = d9vk
-	provides = dxvk=2.0
+	provides = dxvk=2.1
 	conflicts = dxvk
 	conflicts = d9vk
 	options = !lto
 	options = !staticlibs
-	source = git+https://github.com/doitsujin/dxvk.git#tag=v2.0
+	source = git+https://github.com/doitsujin/dxvk.git#tag=v2.1
 	source = git+https://github.com/KhronosGroup/Vulkan-Headers.git
 	source = git+https://github.com/KhronosGroup/SPIRV-Headers.git
+	source = git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git
 	source = dxvk-async-2.0.patch::https://raw.githubusercontent.com/Sporif/dxvk-async/2.0/dxvk-async.patch
 	source = dxvk-async-conf.patch
 	source = dxvk-extraopts.patch
@@ -30,6 +31,7 @@ pkgbase = dxvk-mingw
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 85877b6ea801b3a139797628415ac5c74ec87ce16d1d3c434f5c36b00922833d
 	sha256sums = c9c2f02bce1e1e93d511aff73484208456835d4d7601a36ab4524939472fc401
 	sha256sums = bcc15521e4c7f966a0192a1dabb7fb4935b33db39344ab5b861f9d81486f1362
diff --git a/PKGBUILD b/PKGBUILD
index f09546733149..1f4ea91e95f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: loathingkernel <loathingkernel @at gmail .dot com>
 
 pkgname=dxvk-mingw
-pkgver=2.0
+pkgver=2.1
 _asyncver=2.0
 pkgrel=1
 pkgdesc='Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine, MingW version'
@@ -17,6 +17,7 @@ source=(
     "git+https://github.com/doitsujin/dxvk.git#tag=v$pkgver"
     "git+https://github.com/KhronosGroup/Vulkan-Headers.git"
     "git+https://github.com/KhronosGroup/SPIRV-Headers.git"
+    "git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git"
     "dxvk-async-${_asyncver}.patch::https://raw.githubusercontent.com/Sporif/dxvk-async/${_asyncver}/dxvk-async.patch"
     "dxvk-async-conf.patch"
     "dxvk-extraopts.patch"
@@ -26,10 +27,14 @@ source=(
 prepare() {
     cd dxvk
 
-    git submodule init include/{vulkan,spirv}
+    git revert -n 7644776f7a3bc6a097f20c1465708acf88ad215f
+    git revert -n 64cb1ad208f80b11400eef779e99fec223754098
+
+    git submodule init include/{vulkan,spirv} subprojects/libdisplay-info
     git submodule set-url include/vulkan "$srcdir/Vulkan-Headers"
     git submodule set-url include/spirv "$srcdir/SPIRV-Headers"
-    git -c protocol.file.allow=always submodule update include/{vulkan,spirv}
+    git submodule set-url subprojects/libdisplay-info "$srcdir/libdisplay-info"
+    git -c protocol.file.allow=always submodule update include/{vulkan,spirv} subprojects/libdisplay-info
 
     # Uncomment to enable dxvk async patch.
     # Enable at your own risk. If you don't know what it is,
@@ -117,6 +122,7 @@ package() {
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '85877b6ea801b3a139797628415ac5c74ec87ce16d1d3c434f5c36b00922833d'
             'c9c2f02bce1e1e93d511aff73484208456835d4d7601a36ab4524939472fc401'
             'bcc15521e4c7f966a0192a1dabb7fb4935b33db39344ab5b861f9d81486f1362'
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index d91971af363a..f47c205a678a 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -1,7 +1,7 @@
 # Maintainer: loathingkernel <loathingkernel @at gmail .dot com>
 
 pkgname=dxvk-mingw
-pkgver=2.0.r117.g41ee092b
+pkgver=2.1.r0.g2abc102d
 _asyncver=master
 pkgrel=1
 pkgdesc='Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine, MingW version'