Update build_wine.sh

Kron4ek · Mar 21, 2020 · 318482f · 318482f
1 parent 337641b
commit 318482f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/build_wine.sh b/build_wine.sh
@@ -165,14 +165,15 @@ if [ "$2" = "improved" ]; then
 	wget https://github.com/wine-staging/wine-staging/archive/v$WINE_VERSION_NUMBER.tar.gz
 	git clone https://github.com/Tk-Glitch/PKGBUILDS.git
 	wget -O fshack-unbreak.patch https://raw.githubusercontent.com/Kron4ek/Wine-Builds/master/fshack-unbreak.patch
-	wget -O LAA-staging.patch https://raw.githubusercontent.com/Kron4ek/Wine-Builds/master/LAA-staging.patch
+	wget -O wineuser_env.patch https://raw.githubusercontent.com/Kron4ek/Wine-Builds/master/wineuser_env.patch
 
 	tar xf wine-$WINE_VERSION_NUMBER.tar.xz
 	tar xf v$WINE_VERSION_NUMBER.tar.gz
 
 	mv wine-$WINE_VERSION_NUMBER wine
 	cd wine
 
+	patch -Np1 < "$SOURCES_DIR"/wineuser_env.patch || patching_error
 	patch -Np1 < "$SOURCES_DIR"/fshack-unbreak.patch || patching_error
 	patch -Np1 < "$PATCHES_DIR"/proton/use_clock_monotonic.patch || patching_error
 	patch -Np1 < "$PATCHES_DIR"/proton/use_clock_monotonic-2.patch || patching_error
@@ -187,6 +188,7 @@ if [ "$2" = "improved" ]; then
 
 	patch -Np1 < "$PATCHES_DIR"/proton/fsync-staging.patch || patching_error
 	patch -Np1 < "$PATCHES_DIR"/proton/fsync-staging-no_alloc_handle.patch || patching_error
+	patch -Np1 < "$PATCHES_DIR"/proton/fsync-spincounts.patch || patching_error
 
 	patch -Np1 < "$PATCHES_DIR"/proton/FS_bypass_compositor.patch || patching_error
 	patch -Np1 < "$PATCHES_DIR"/proton/valve_proton_fullscreen_hack-staging.patch || patching_error
@@ -201,9 +203,11 @@ if [ "$2" = "improved" ]; then
 
 	patch -Np1 < "$PATCHES_DIR"/proton-tkg-specific/proton-staging_winex11-MWM_Decorations.patch || patching_error
 
-	patch -Np1 < "$SOURCES_DIR"/LAA-staging.patch || patching_error
+	patch -Np1 < "$PATCHES_DIR"/proton/LAA-staging.patch || patching_error
 	patch -Np1 < "$PATCHES_DIR"/proton/proton_mf_hacks.patch || patching_error
 	patch -Np1 < "$PATCHES_DIR"/misc/enable_stg_shared_mem_def.patch || patching_error
+
+	patch -Np1 < "$PATCHES_DIR_COMMUNITY"/winevulkan_fshack_opts.mypatch || patching_error
 elif [ "$2" = "proton" ]; then
 	WINE_VERSION="$WINE_VERSION_NUMBER-proton"
 	WINE_VERSION_STRING="Proton"