Update DXVK to version 1.7.3

In evesetup.shlib function check_wine are now skippable to make using of customized wine-scripts possible.

3 files changed, 54 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83879e079e22..ec867a5f9d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1747682
-	pkgrel = 7
+	pkgrel = 8
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = zlib
@@ -58,13 +58,13 @@ pkgbase = evesetup
 	source = eve-transl5.12-ru.tar.gz
 	source = eve-transl5.12-zh.tar.gz
 	source = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
-	source = https://github.com/doitsujin/dxvk/releases/download/v1.7.2/dxvk-1.7.2.tar.gz
+	source = https://github.com/doitsujin/dxvk/releases/download/v1.7.3/dxvk-1.7.3.tar.gz
 	source = https://binaries.eveonline.com/evelauncher-1747682.tar.gz
 	sha256sums = ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4
 	sha256sums = 29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b
 	sha256sums = 77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = d3bf90cdab56186c8d0debc24c20472b6febb9f19ef215fc164b22fecaecd186
+	sha256sums = f73da35da493d8f756692746e5c75a5674a10b7f2cd87fc563bebcf11e027e16
 	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
 	sha256sums = dd8686f109be618c5b582ec143ba01c6d0da5771f809e169914ee8cd09d1ef29
 	sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
@@ -88,7 +88,7 @@ pkgbase = evesetup
 	sha256sums = 1a83a791b5a189823f71cdfb1e0c0e15139ff7f563bfb3eac70a5fa4ad9ebc22
 	sha256sums = 5ffd6578dfbb9bf1647fbae819e3ddae0722c2613779c122d86963123470359f
 	sha256sums = ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2
-	sha256sums = 1662f6bda93faf4f6c8b57d656779b08925889dd6b794114be874d6deb97e15b
+	sha256sums = e4c2444256b7ad63455fa6329638e3f42900ec7462dc9c26da56187a2040aba0
 	sha256sums = 98ccf4b9932d7fb74896461f764c61921592a73089e3fcb4063fe7836c6a0bca
 
 pkgname = evesetup
diff --git a/PKGBUILD b/PKGBUILD
index de3e2b5b9870..efa600da7223 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Jernuh Zakalwe <jzakalwe1st@gmail.com>
 pkgname=evesetup
 pkgver=1747682
-pkgrel=7
+pkgrel=8
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -53,7 +53,7 @@ source=("evelauncher.desktop"
         "eve-transl5.12-ru.tar.gz"
         "eve-transl5.12-zh.tar.gz"
         "https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run"
-        "https://github.com/doitsujin/dxvk/releases/download/v1.7.2/dxvk-1.7.2.tar.gz"
+        "https://github.com/doitsujin/dxvk/releases/download/v1.7.3/dxvk-1.7.3.tar.gz"
         "https://binaries.eveonline.com/evelauncher-${pkgver}.tar.gz")
 
 noextract=('eve-transl5.12-de.tar.gz'
@@ -97,9 +97,9 @@ package() {
         cp ${srcdir}/evesetup.shlib ${pkgdir}/opt/${pkgname}/lib
         cp ${srcdir}/evelauncher.lua ${pkgdir}/opt/${pkgname}/doc
         cp ${srcdir}/evelauncher.kwinrule ${pkgdir}/opt/${pkgname}/doc
-        cp -r ${srcdir}/dxvk-1.7.2/x32 ${pkgdir}/opt/${pkgname}/lib/dxvk/
-        cp -r ${srcdir}/dxvk-1.7.2/x64 ${pkgdir}/opt/${pkgname}/lib/dxvk/
-        echo "1.7.2" >${pkgdir}/opt/${pkgname}/lib/dxvk/version
+        cp -r ${srcdir}/dxvk-1.7.3/x32 ${pkgdir}/opt/${pkgname}/lib/dxvk/
+        cp -r ${srcdir}/dxvk-1.7.3/x64 ${pkgdir}/opt/${pkgname}/lib/dxvk/
+        echo "1.7.3" >${pkgdir}/opt/${pkgname}/lib/dxvk/version
         cp -r ${srcdir}/icons ${pkgdir}/usr/share/
         rm -rf ${srcdir}/evelauncher/resources/ ${srcdir}/evelauncher/plugins/
         rm -f ${srcdir}/evelauncher/*[Qq]t* ${srcdir}/evelauncher/libcrypto*
@@ -128,7 +128,7 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             '29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b'
             '77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            'd3bf90cdab56186c8d0debc24c20472b6febb9f19ef215fc164b22fecaecd186'
+            'f73da35da493d8f756692746e5c75a5674a10b7f2cd87fc563bebcf11e027e16'
             'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
             'dd8686f109be618c5b582ec143ba01c6d0da5771f809e169914ee8cd09d1ef29'
             '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
@@ -152,5 +152,5 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             '1a83a791b5a189823f71cdfb1e0c0e15139ff7f563bfb3eac70a5fa4ad9ebc22'
             '5ffd6578dfbb9bf1647fbae819e3ddae0722c2613779c122d86963123470359f'
             'ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2'
-            '1662f6bda93faf4f6c8b57d656779b08925889dd6b794114be874d6deb97e15b'
+            'e4c2444256b7ad63455fa6329638e3f42900ec7462dc9c26da56187a2040aba0'
             '98ccf4b9932d7fb74896461f764c61921592a73089e3fcb4063fe7836c6a0bca')
diff --git a/evesetup.shlib b/evesetup.shlib
index 5a96862d1195..76742d4a8dd9 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -73,51 +73,51 @@ check_wine() {
 	else
 		WINE=$WINEPATH/wine
 	fi
-	if [ ! -x "$WINE" ] ;then
-		desktop_msg "ERROR: \"$CUSTOMWP\" not found!"
-		exit 1
-	fi
-	INSTWINE=$(tr -dc [:digit:] 2>/dev/null < $WINEPREFIX/.update-timestamp || printf 0)
-	WINEINFP=$(readlink -f $CUSTOMWP)
-	WINECONF=$(find ${WINEINFP%bin*}share/wine* -name 'wine.inf')
-	WINEDATE=$(getdate $WINECONF)
-	if [ "$WINEDATE" != "$INSTWINE" ] ;then
-		desktop_msg "Prepare wine environment for EVE"
-		for DXVKFILE in d3d10_1 d3d10core d3d10 d3d11 d3d9 dxgi ;do
-			rm $WINSYSDIR/$DXVKFILE.dll* || true
-			rm $W32SYSDIR/$DXVKFILE.dll* || true
-			sed -i /\"$DXVKFILE\"=\"/d $WINEPREFIX/user.reg || true
-		done
-		env WINEPREFIX=$WINEPREFIX \
-			WINEDEBUG=-all \
-			WINEDLLOVERRIDES="mscoree,mshtml=d" \
-			$WINE wineboot
-		env WINEPREFIX=$WINEPREFIX \
-			$WINE reg add \
-			'HKCU\Software\Wine\FileOpenAssociations' \
-			/v Enable /d N /f >/dev/null
-	fi
-	if [ -d "$DXVKLIBDIR" ] ;then
-		DXVKARC=$(getdate $DXVKLIBDIR/x64/d3d11.dll)
-		INSTDX=$(getdate $WINSYSDIR/d3d11.dll)
-		if [ "$INSTDX" != "$DXVKARC" ] ;then
-			for DXVKFILE in $DXVKFILELIST ;do
-				cp --preserve=timestamps $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll
-				if [ -d "$W32SYSDIR" ] ;then
-					cp --preserve=timestamps $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll
-				fi
-				env WINEPREFIX=$WINEPREFIX \
-					$WINE reg add \
-					'HKCU\Software\Wine\DllOverrides' \
-					/v $DXVKFILE /d native /f >/dev/null
+	if [ -x "$WINE" ] ;then
+		INSTWINE=$(tr -dc [:digit:] 2>/dev/null < $WINEPREFIX/.update-timestamp || printf 0)
+		WINEINFP=$(readlink -f $CUSTOMWP)
+		WINECONF=$(find ${WINEINFP%bin*}share/wine* -name 'wine.inf')
+		WINEDATE=$(getdate $WINECONF)
+		if [ "$WINEDATE" != "$INSTWINE" ] ;then
+			desktop_msg "Prepare wine environment for EVE"
+			for DXVKFILE in d3d10_1 d3d10core d3d10 d3d11 d3d9 dxgi ;do
+				rm $WINSYSDIR/$DXVKFILE.dll* || true
+				rm $W32SYSDIR/$DXVKFILE.dll* || true
+				sed -i /\"$DXVKFILE\"=\"/d $WINEPREFIX/user.reg || true
 			done
+			env WINEPREFIX=$WINEPREFIX \
+				WINEDEBUG=-all \
+				WINEDLLOVERRIDES="mscoree,mshtml=d" \
+				$WINE wineboot
+			env WINEPREFIX=$WINEPREFIX \
+				$WINE reg add \
+				'HKCU\Software\Wine\FileOpenAssociations' \
+				/v Enable /d N /f >/dev/null
 		fi
-	fi
-	if [ "$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "0" ] ;then
-		env WINEPREFIX=$WINEPREFIX \
-			$WINE reg delete \
-			'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \
-			/v winemenubuilder /f >/dev/null
+		if [ -d "$DXVKLIBDIR" ] ;then
+			DXVKARC=$(getdate $DXVKLIBDIR/x64/d3d10core.dll)
+			INSTDX=$(getdate $WINSYSDIR/d3d10core.dll)
+			if [ "$INSTDX" != "$DXVKARC" ] ;then
+				for DXVKFILE in $DXVKFILELIST ;do
+					cp --preserve=timestamps $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll
+					if [ -d "$W32SYSDIR" ] ;then
+						cp --preserve=timestamps $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll
+					fi
+					env WINEPREFIX=$WINEPREFIX \
+						$WINE reg add \
+						'HKCU\Software\Wine\DllOverrides' \
+						/v $DXVKFILE /d native /f >/dev/null
+				done
+			fi
+		fi
+		if [ "$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "0" ] ;then
+			env WINEPREFIX=$WINEPREFIX \
+				$WINE reg delete \
+				'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \
+				/v winemenubuilder /f >/dev/null
+		fi
+	else
+		desktop_msg "Info: Wine environment test skipped."
 	fi
 }