Add mingw-w64-tools dependency

3 files changed, 22 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2381f81e2fc4..70d0742dc6b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = proton-native
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components. Monolithic distribution
 	pkgver = 5.13.5
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = proton-native
 	makedepends = fontforge
 	makedepends = flex
 	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-tools
 	makedepends = meson
 	makedepends = cargo
 	makedepends = rust
@@ -219,7 +220,7 @@ pkgbase = proton-native
 	sha256sums = 06a00cedf391ee07bbca0b3282e5c8ad9d950446d50648d2ff417716816fd1ab
 	sha256sums = ea5246e4c91d1aa1226658e1749b6e5d0e9353b52b14df79c4b93b6e61a3c59e
 	sha256sums = b17ac815afbf5eef768c4e8d50800be02af75c8b230d668e239bad99616caa82
-	sha256sums = 5722c9669b02592cc53adda14a9e256701ed88f875dc00d24b5c5705cf6c33f5
+	sha256sums = 7688cbba34c7e47252f6ab6341b6b5ec25ffcea9f68af65fcceaa9a8073e32ef
 	sha256sums = 8263a3ffb7f8e7a5d81bfbffe1843d6f84502d3443fe40f065bcae02b36ba954
 	sha256sums = 20f7cd3e70fad6f48d2f1a26a485906a36acf30903bf0eefbf82a7c400e248f3
 	sha256sums = 36aaba6847e4577df4a496d88c11b4b7049773f1f2b90aa4545093e16d5c6066
diff --git a/PKGBUILD b/PKGBUILD
index 3be2752d7e47..4c6565247dcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.1
 _monover=5.1.1
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components. Monolithic distribution"
 arch=(x86_64)
@@ -33,6 +33,7 @@ depends=(
   steam-native-runtime
 )
 makedepends=(autoconf ncurses bison perl fontforge flex mingw-w64-gcc
+  mingw-w64-tools
   meson
   cargo
   rust                  lib32-rust-libs
@@ -128,7 +129,7 @@ prepare() {
     # I know this is fugly and it should NOT be done
     # but the afdko package from AUR breaks regularly.
     # Install it from pip in a virtualenv
-    virtualenv --no-wheel afdko
+    virtualenv --app-data "$srcdir"/afdko/cache --no-wheel afdko
     source afdko/bin/activate
     pip install --no-cache-dir afdko
 
@@ -326,7 +327,7 @@ sha256sums=('SKIP'
             '06a00cedf391ee07bbca0b3282e5c8ad9d950446d50648d2ff417716816fd1ab'
             'ea5246e4c91d1aa1226658e1749b6e5d0e9353b52b14df79c4b93b6e61a3c59e'
             'b17ac815afbf5eef768c4e8d50800be02af75c8b230d668e239bad99616caa82'
-            '5722c9669b02592cc53adda14a9e256701ed88f875dc00d24b5c5705cf6c33f5'
+            '7688cbba34c7e47252f6ab6341b6b5ec25ffcea9f68af65fcceaa9a8073e32ef'
             '8263a3ffb7f8e7a5d81bfbffe1843d6f84502d3443fe40f065bcae02b36ba954'
             '20f7cd3e70fad6f48d2f1a26a485906a36acf30903bf0eefbf82a7c400e248f3'
             '36aaba6847e4577df4a496d88c11b4b7049773f1f2b90aa4545093e16d5c6066'
diff --git a/proton-unfuck_makefile.patch b/proton-unfuck_makefile.patch
index 10d8410a83a0..90fec11d0f32 100644
--- a/proton-unfuck_makefile.patch
+++ b/proton-unfuck_makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/build/makefile_base.mak b/build/makefile_base.mak
-index 8d2554b..e7e1f81 100644
+index 8d2554b..08b6336 100644
 --- a/build/makefile_base.mak
 +++ b/build/makefile_base.mak
 @@ -68,7 +68,7 @@ endif
@@ -242,7 +242,13 @@ index 8d2554b..e7e1f81 100644
  	mkdir -p "$(DST_DIR)"/lib/wine/dxvk
  	cp -f "$(DXVK_OBJ32)"/bin/dxgi.dll "$(DST_DIR)"/lib/wine/dxvk/
  	cp -f "$(DXVK_OBJ32)"/bin/d3d11.dll "$(DST_DIR)"/lib/wine/dxvk/
-@@ -1522,7 +1553,7 @@ $(VKD3D_CONFIGURE_FILES32): $(VKD3D)/meson.build $(VKD3D)/build-win32.txt | $(VK
+@@ -1517,12 +1548,12 @@ $(VKD3D_CONFIGURE_FILES32): $(VKD3D)/meson.build $(VKD3D)/build-win32.txt | $(VK
+ 			meson --prefix="$(abspath $(VKD3D_OBJ32))" \
+ 				--cross-file "$(abspath $(VKD3D))/build-win32.txt" \
+ 				$(MESON_STRIP_ARG) \
+-				--buildtype=release -Denable_standalone_d3d12=true \
++				--buildtype=release -Denable_d3d12=true \
+ 				"$(abspath $(VKD3D))"
  
  vkd3d32: SHELL = $(CONTAINER_SHELL32)
  vkd3d32: $(VKD3D_CONFIGURE_FILES32)
@@ -251,7 +257,13 @@ index 8d2554b..e7e1f81 100644
  	mkdir -p "$(DST_DIR)"/lib/wine/vkd3d-proton
  	cp -af "$(VKD3D_OBJ32)/bin/d3d12.dll" "$(DST_DIR)"/lib/wine/vkd3d-proton/
  	rm -f "$(DST_DIR)"/lib/wine/vkd3d-proton/version && if test -e $(SRCDIR)/.git; then ( cd $(SRCDIR) && git submodule status -- vkd3d-proton ) > "$(DST_DIR)"/lib/wine/vkd3d-proton/version; fi
-@@ -1539,7 +1570,7 @@ $(VKD3D_CONFIGURE_FILES64): $(VKD3D)/meson.build $(VKD3D)/build-win64.txt | $(VK
+@@ -1534,12 +1565,12 @@ $(VKD3D_CONFIGURE_FILES64): $(VKD3D)/meson.build $(VKD3D)/build-win64.txt | $(VK
+ 			meson --prefix="$(abspath $(VKD3D_OBJ64))" \
+ 				--cross-file "$(abspath $(VKD3D))/build-win64.txt" \
+ 				$(MESON_STRIP_ARG) \
+-				--buildtype=release -Denable_standalone_d3d12=true \
++				--buildtype=release -Denable_d3d12=true \
+ 				"$(abspath $(VKD3D))"
  
  vkd3d64: SHELL = $(CONTAINER_SHELL64)
  vkd3d64: $(VKD3D_CONFIGURE_FILES64)