build: import more upstream changes

configure.sh

@@ -106,12 +106,6 @@ function configure() {
     die "Create a subdirectory in build/ or outside of the tree and run configure.sh from there."
   fi
 
-  # nothing specified, getting the default value from the Makefile to test the
-  # container engine
-  if [[ -z $steamrt_image ]]; then
-    steamrt_image="$(sed -n 's/STEAMRT_IMAGE ?= //p' $SRCDIR/Makefile.in)"
-  fi
-
   # Build name
   local build_name="$arg_build_name"
   if [[ -n $build_name ]]; then
@@ -133,6 +127,12 @@ function configure() {
   fi
   info "Build targetting: $target_arch"
 
+  # nothing specified, getting the default value from the Makefile to test the
+  # container engine
+  if [[ -z $steamrt_image ]]; then
+    steamrt_image="$(make --silent "SRCDIR=$srcdir" --file "$srcdir/Makefile.in" "TARGET_ARCH=$target_arch" get-steamrt-image)"
+  fi
+
   dependency_command make "GNU Make"
 
   if [ "$MISSING_DEPENDENCIES" -ne 0 ]; then

make/rules-arm64x-forwarder.mk

@@ -0,0 +1,25 @@
+# parameters:
+#   $(1): lowercase package name
+#   $(2): uppercase package name
+define create-rules-arm64x-forwarders
+$(2)_OBJ := $$(OBJ)/obj-$(1)
+
+$$($(2)_OBJ):
+	mkdir -p $$@
+
+$$(OBJ)/.$(1)-build: $$(OBJ)/.$(1)-source
+$$(OBJ)/.$(1)-build: | $$($(2)_OBJ)
+	cd "$$($(2)_OBJ)" && $$(MAKE) --file $$($(2)_SRC)/Makefile SRC=$$($(2)_SRC) DST=$$($(2)_OBJ) all
+	touch $$@
+
+$$(OBJ)/.$(1)-post-build: $$(OBJ)/.$(1)-build
+
+$(1)-build: $$(OBJ)/.$(1)-build
+all-build: $(1)-build
+.PHONY: all-build
+
+all-dist: $$(OBJ)/.$(1)-post-build
+.PHONY: all-dist
+endef
+
+rules-arm64x-forwarders = $(call create-rules-arm64x-forwarders,$(1),$(call toupper,$(1)))

make/rules-cargo.mk

@@ -41,4 +41,6 @@ aarch64-unix_CARGO_ARGS := --target $(aarch64-unix_CARGO_TARGET)
 #
 # HACK: forced to gcc-10 because Sniper's (SteamRT) gcc-14 doesn't come with
 # shared libgcc_s.so and cargo/rustc (?) forces shared linking with that lib.
-CARGO_LINKERS :=  $(foreach a,$(unix_ARCHS),CARGO_TARGET_$(call toupper,$($(a)-unix_CARGO_TARGET))_LINKER="$($(a)-unix_TARGET)-gcc-10")
+ifeq ($(TARGET_ARCH),x86_64)
+	CARGO_LINKERS :=  $(foreach a,$(unix_ARCHS),CARGO_TARGET_$(call toupper,$($(a)-unix_CARGO_TARGET))_LINKER="$($(a)-unix_TARGET)-gcc-10")
+endif

make/rules-makedep.mk

@@ -61,8 +61,6 @@ $$(OBJ)/.$(1)-$(3)-configure: $$(OBJ)/.wine-$$(HOST_ARCH)-tools
 	    -e '/^arm64ec_CPPFLAGS/c arm64ec_CPPFLAGS = $$($(2)_arm64ec_INCFLAGS) $$($(2)_CFLAGS) $$(arm64ec_CFLAGS) $$(CFLAGS)' \
 	    -e '/^arm64ec_CXXFLAGS/c arm64ec_CXXFLAGS = $$($(2)_arm64ec_INCFLAGS) -std=c++17 $$($(2)_CFLAGS) $$(arm64ec_CFLAGS) $$(CFLAGS)' \
 	    -e '/^arm64ec_LDFLAGS/c arm64ec_LDFLAGS = $$($(2)_arm64ec_LIBFLAGS) $$(arm64ec_LDFLAGS) $$(LDFLAGS)' \
-	    \
-	    -e '/^PE_ARCHS/s/aarch64//' \
 	    $$(WINE_$(3)_OBJ)/Makefile > $$($(2)_$(3)_OBJ)/Makefile
 
 	cd "$$($(2)_$(3)_OBJ)" && env $$($(2)_$(3)_ENV) \

toolmanifest_arm64.vdf

@@ -2,7 +2,7 @@
 {
   "version" "2"
   "commandline" "/proton %verb%"
-  "require_tool_appid" "3810310"
+  "require_tool_appid" "4185400"
   "use_sessions" "1"
   "compatmanager_layer_name" "proton"
 }

xalia-fixups.gudl

@@ -1,15 +1 @@
 // Fixes applied to Xalia's main.gudl for Proton. Update these in xalia-fixups.gudl.
-
-if (is_hwnd_syslink) {
-    supported: true;
-}
-
-if (win32_class_name == "Rockstar Games Launcher Installer") {
-    application_supports_gamepad: true;
-}
-
-dialog (child_matches(edit and readonly and multiline and autovscroll and autohscroll and win32_control_id == 1005))
-{
-    // GPU driver warning from Embark Studios games (ARC Raiders and THE FINALS) - BM_CLICK dismisses dialog but doesn't start the game
-    manual_buttons: true;
-}