[proton-experimental] Version 8.0-20230721

1 files changed, 46 insertions, 32 deletions

diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 93dfb443a3d0..3f80124b1fe2 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,10 +1,10 @@
-From c7c879ae09e56fba5a420e02c34299b15477fcbe Mon Sep 17 00:00:00 2001
+From 492d6a2c3c87be3ffd04712110c24c6694ee2c14 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 26 Apr 2023 14:22:23 +0300
 Subject: [PATCH 1/4] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 70 ++++++++++++++++++++++++++--------
+ Makefile.in                    | 73 +++++++++++++++++++++++++++-------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
@@ -16,13 +16,13 @@ Subject: [PATCH 1/4] AUR Pkgbuild changes
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 12 files changed, 83 insertions(+), 39 deletions(-)
+ 12 files changed, 86 insertions(+), 39 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 1ab5f54f..9a2028e3 100644
+index 07938e97..399c87e7 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -50,14 +50,23 @@ else
+@@ -50,11 +50,12 @@ else
  endif
  
  CROSSLDFLAGS   += -Wl,--file-alignment,4096
@@ -35,7 +35,11 @@ index 1ab5f54f..9a2028e3 100644
 -COMMON_FLAGS32 := -mstackrealign
 +COMMON_FLAGS32 := -mstackrealign -mno-avx
  COMMON_FLAGS64 := -mcmodel=small
- CARGO_BUILD_ARG := --release
+ CARGO_BUILD_ARGS += --release
+ 
+@@ -62,6 +63,14 @@ ifneq ($(SUPPRESS_WARNINGS),)
+ 	COMMON_FLAGS += -w
+ endif
  
 +ifneq ($(USE_LTO), 1)
 +GST_LTO :=
@@ -48,7 +52,7 @@ index 1ab5f54f..9a2028e3 100644
  $(DST_DIR):
  	mkdir -p $@
  
-@@ -68,7 +77,7 @@ all: all-dist | $(DST_DIR)
+@@ -72,7 +81,7 @@ all: all-dist | $(DST_DIR)
  all-dist: | $(DST_DIR)
  dist: all
  
@@ -57,7 +61,7 @@ index 1ab5f54f..9a2028e3 100644
  
  include $(SRC)/make/utility.mk
  include $(SRC)/make/rules-source.mk
-@@ -99,6 +108,7 @@ $(eval $(call rules-meson,dav1d,64))
+@@ -103,6 +112,7 @@ $(eval $(call rules-meson,dav1d,64))
  ##
  
  GST_ORC_MESON_ARGS := \
@@ -65,7 +69,7 @@ index 1ab5f54f..9a2028e3 100644
  	-Dorc-test=disabled
  
  $(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc))
-@@ -111,9 +121,14 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -115,9 +125,14 @@ $(eval $(call rules-meson,gst_orc,64))
  ##
  
  GSTREAMER_MESON_ARGS := \
@@ -80,7 +84,7 @@ index 1ab5f54f..9a2028e3 100644
  	-Dbash-completion=disabled
  
  GSTREAMER_DEPENDS = gst_orc
-@@ -127,6 +142,11 @@ $(eval $(call rules-meson,gstreamer,64))
+@@ -131,6 +146,11 @@ $(eval $(call rules-meson,gstreamer,64))
  ## graphene
  ##
  
@@ -92,7 +96,7 @@ index 1ab5f54f..9a2028e3 100644
  $(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
  $(eval $(call rules-meson,graphene,32))
  $(eval $(call rules-meson,graphene,64))
-@@ -137,6 +157,9 @@ $(eval $(call rules-meson,graphene,64))
+@@ -141,6 +161,9 @@ $(eval $(call rules-meson,graphene,64))
  ##
  
  GST_BASE_MESON_ARGS := \
@@ -102,7 +106,7 @@ index 1ab5f54f..9a2028e3 100644
  	-Dauto_features=disabled \
  	-Dadder=enabled \
  	-Dapp=enabled \
-@@ -170,6 +193,8 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -174,6 +197,8 @@ $(eval $(call rules-meson,gst_base,64))
  ##
  
  GST_GOOD_MESON_ARGS := \
@@ -111,7 +115,7 @@ index 1ab5f54f..9a2028e3 100644
  	-Dauto_features=disabled \
  	-Daudioparsers=enabled \
  	-Dautodetect=enabled \
-@@ -200,11 +225,17 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -204,11 +229,17 @@ $(eval $(call rules-meson,gst_good,64))
  
  FFMPEG_CONFIGURE_ARGS := \
  	--enable-shared \
@@ -129,7 +133,17 @@ index 1ab5f54f..9a2028e3 100644
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
  $(eval $(call rules-configure,ffmpeg,64))
-@@ -473,7 +504,11 @@ WINE_SOURCE_ARGS = \
+@@ -415,6 +446,9 @@ OPENFST_CONFIGURE_ARGS = \
+   --with-pic \
+   --disable-bin \
+ 
++OPENFST_CFLAGS = -mno-bmi2
++OPENFST_CXXFLAGS = -mno-bmi2
++
+ $(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
+ $(eval $(call rules-autoconf,openfst,32))
+ $(eval $(call rules-autoconf,openfst,64))
+@@ -477,7 +511,11 @@ WINE_SOURCE_ARGS = \
    --exclude dlls/winevulkan/winevulkan.spec
  
  WINE_CONFIGURE_ARGS = \
@@ -141,37 +155,37 @@ index 1ab5f54f..9a2028e3 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -543,6 +578,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -547,6 +585,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  DXVK_DEPENDS = glslang
  
-+DXVK_CPPFLAGS= -msse -msse2
-+DXVK_LDFLAGS= -static -static-libgcc -static-libstdc++
++DXVK_CPPFLAGS = -msse -msse2
++DXVK_LDFLAGS = -static -static-libgcc -static-libstdc++
 +
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -570,6 +608,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -574,6 +615,9 @@ $(OBJ)/.dxvk-post-build32:
  DXVK_NVAPI_MESON_ARGS32 = --bindir=$(DXVK_NVAPI_DST32)/lib/wine/nvapi
  DXVK_NVAPI_MESON_ARGS64 = --bindir=$(DXVK_NVAPI_DST64)/lib64/wine/nvapi
  
-+DXVK_NVAPI_CPPFLAGS= -msse -msse2
-+DXVK_NVAPI_LDFLAGS= -static -static-libgcc -static-libstdc++
++DXVK_NVAPI_CPPFLAGS = -msse -msse2
++DXVK_NVAPI_LDFLAGS = -static -static-libgcc -static-libstdc++
 +
  $(eval $(call rules-source,dxvk-nvapi,$(SRCDIR)/dxvk-nvapi))
  $(eval $(call rules-meson,dxvk-nvapi,32,CROSS))
  $(eval $(call rules-meson,dxvk-nvapi,64,CROSS))
-@@ -644,6 +685,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -648,6 +692,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
  
-+VKD3D_PROTON_CPPFLAGS= -msse -msse2
-+VKD3D_PROTON_LDFLAGS= -static -static-libgcc -static-libstdc++
++VKD3D_PROTON_CPPFLAGS = -msse -msse2
++VKD3D_PROTON_LDFLAGS = -static -static-libgcc -static-libstdc++
 +
  $(eval $(call rules-source,vkd3d-proton,$(SRCDIR)/vkd3d-proton))
  $(eval $(call rules-meson,vkd3d-proton,32,CROSS))
  $(eval $(call rules-meson,vkd3d-proton,64,CROSS))
-@@ -903,14 +947,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -928,14 +975,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
  	mkdir -p $(FONTS_OBJ)/source-han
  	# Do not immediately create the target file, so that make is interrupted
  	# it will restart again
@@ -189,7 +203,7 @@ index 1ab5f54f..9a2028e3 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -920,12 +964,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -945,12 +992,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
  	ttx -o $@ -m $($(notdir $@)_FONT) $(FONTS_OBJ)/ume-gothic/$(notdir $(basename $($(notdir $@)_NAMETABLE_PATCH))).ttx
  
  $(simsun.ttc): $(simsun.ttf) $(nsimsun.ttf)
@@ -205,7 +219,7 @@ index 1ab5f54f..9a2028e3 100644
  
  $(micross.ttf): $(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_arabic.ttf) $(noto_sans_armenian.ttf) $(noto_sans_bengali.ttf) $(noto_sans_coptic.ttf) \
  		$(noto_sans_georgian.ttf) $(noto_sans_gujarati.ttf) $(noto_sans_hebrew.ttf) $(noto_sans_khmer.ttf) $(noto_sans_tamil.ttf) \
-@@ -1051,8 +1095,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1076,8 +1123,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
  ##
  
  default_pfx: wine gst_good gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr dxvk dxvk-nvapi vkd3d-proton
@@ -216,7 +230,7 @@ index 1ab5f54f..9a2028e3 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1184,7 +1228,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1209,7 +1256,6 @@ ifeq ($(ENABLE_CCACHE),1)
  	export CCACHE_DIR := $(if $(CCACHE_DIR),$(CCACHE_DIR),$(HOME)/.ccache)
  	override DOCKER_OPTS := -v $(CCACHE_DIR):$(CCACHE_DIR)$(CONTAINER_MOUNT_OPTS) $(CCACHE_ENV) -e CCACHE_DIR=$(CCACHE_DIR) $(DOCKER_OPTS)
  else
@@ -224,7 +238,7 @@ index 1ab5f54f..9a2028e3 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1199,9 +1242,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1224,9 +1270,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
@@ -232,8 +246,8 @@ index 1ab5f54f..9a2028e3 100644
 -                -w $(OBJ) -e MAKEFLAGS \
 -                $(DOCKER_OPTS) $(STEAMRT_IMAGE)
  
- .PHONY: dist deploy redist
- .DEFAULT dist deploy redist:
+ .PHONY: dist deploy redist symstore-tarball
+ .DEFAULT dist deploy redist symstore-tarball:
 diff --git a/compatibilitytool.vdf.template b/compatibilitytool.vdf.template
 index 5ac60e8b..e580cd20 100644
 --- a/compatibilitytool.vdf.template
@@ -284,7 +298,7 @@ index ad04eeb8..53eda5bc 100644
  endef
  
 diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk
-index ea76678b..45bd7381 100644
+index d80ff9ed..00fa99fc 100644
 --- a/make/rules-cargo.mk
 +++ b/make/rules-cargo.mk
 @@ -13,8 +13,10 @@ $$(OBJ)/.$(1)-configure$(3):
@@ -298,7 +312,7 @@ index ea76678b..45bd7381 100644
 +	      -j$$(SUBJOBS) --locked --offline --verbose \
  	      --target "$$(CARGO_TARGET_$(3))" \
  	      --target-dir $$($(2)_OBJ$(3)) \
- 	      $$(CARGO_BUILD_ARG) \
+ 	      $$(CARGO_BUILD_ARGS) \
 diff --git a/make/rules-cmake.mk b/make/rules-cmake.mk
 index 520d88ac..ab898810 100644
 --- a/make/rules-cmake.mk