Version 1.10.2

2 files changed, 11 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7f0f9750d93..f60e8b602151 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dxvk-mingw
 	pkgdesc = Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine, MingW version
-	pkgver = 1.10.1
-	pkgrel = 2
+	pkgver = 1.10.2
+	pkgrel = 1
 	url = https://github.com/doitsujin/dxvk
 	arch = x86_64
 	license = zlib/libpng
@@ -15,12 +15,12 @@ pkgbase = dxvk-mingw
 	depends = bash
 	provides = dxvk
 	provides = d9vk
-	provides = dxvk=1.10.1
+	provides = dxvk=1.10.2
 	conflicts = dxvk
 	conflicts = d9vk
 	options = !lto
 	options = !staticlibs
-	source = git+https://github.com/doitsujin/dxvk.git#tag=v1.10.1
+	source = git+https://github.com/doitsujin/dxvk.git#tag=v1.10.2
 	source = dxvk-async-1.10.1.patch::https://raw.githubusercontent.com/Sporif/dxvk-async/1.10.1/dxvk-async.patch
 	source = dxvk-async-conf.patch
 	source = dxvk-extraopts.patch
diff --git a/PKGBUILD b/PKGBUILD
index 3e713497dc17..bfe970a09e2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: loathingkernel <loathingkernel @at gmail .dot com>
 
 pkgname=dxvk-mingw
-pkgver=1.10.1
+pkgver=1.10.2
 _asyncver=1.10.1
-pkgrel=2
+pkgrel=1
 pkgdesc='Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine, MingW version'
 arch=('x86_64')
 url="https://github.com/doitsujin/dxvk"
@@ -28,21 +28,8 @@ prepare() {
     # Enable at your own risk. If you don't know what it is,
     # and its implications, leave it as is. You have been warned.
     # I am not liable if anything happens to you by using it.
-    patch -p1 -i "$srcdir"/dxvk-async-${_asyncver}.patch
-    patch -p1 -i "$srcdir"/dxvk-async-conf.patch
-
-    # Filter known bad flags before applying optimizations
-    # Filter fstack-protector{ ,-all,-strong} flag for MingW.
-    # https://github.com/Joshua-Ashton/d9vk/issues/476
-    CFLAGS="${CFLAGS// -fstack-protector*([\-all|\-strong])/}"
-    CXXFLAGS="${CXXFLAGS// -fstack-protector*([\-all|\-strong])/}"
-    # Doesn't compile with these flags in MingW so remove them.
-    # They are also filtered in Wine PKGBUILDs so remove them
-    # for winelib versions too.
-    CFLAGS="${CFLAGS/ -fno-plt/}"
-    CXXFLAGS="${CXXFLAGS/ -fno-plt/}"
-    LDFLAGS="${LDFLAGS/,-z,now/}"
-    LDFLAGS="${LDFLAGS/,-z,relro/}"
+    #patch -p1 -i "$srcdir"/dxvk-async-${_asyncver}.patch
+    #patch -p1 -i "$srcdir"/dxvk-async-conf.patch
 
     # By default export FLAGS used by proton and ignore makepkg
     # This overrides FLAGS from makepkg.conf, if you comment these you are on your own
@@ -117,8 +104,9 @@ package() {
     DESTDIR="$pkgdir" ninja -C "build/x32" install
     DESTDIR="$pkgdir" ninja -C "build/x64" install
     install -Dm 755 -t "$pkgdir/usr/share/dxvk" dxvk/setup_dxvk.sh
-    install -Dm 644 -t "$pkgdir/usr/share/doc/dxvk" dxvk/dxvk.conf
-    install -Dm 644 -t "$pkgdir/usr/share/$pkgname" dxvk/LICENSE
+    install -Dm 644 -t "$pkgdir/usr/share/dxvk" dxvk/dxvk.conf
+    install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname" dxvk/README.md
+    install -Dm 644 -t "$pkgdir/usr/share/licenses/$pkgname" dxvk/LICENSE
     install -Dm 755 -t "$pkgdir/usr/bin" setup_dxvk
 }