[proton*] Enable win16 (no rebuild yet)

5 files changed, 18 insertions, 19 deletions

diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 3e0268497859..153ac0f5fec9 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,10 +1,10 @@
-From 854da9533d94a9cce1e70e1092532584e1a1d547 Mon Sep 17 00:00:00 2001
+From a84106d4199bc906254a4c2545b4bbb9797054e8 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Tue, 7 Feb 2023 21:58:22 +0200
 Subject: [PATCH 1/5] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 70 ++++++++++++++++++++++++++--------
+ Makefile.in                    | 69 ++++++++++++++++++++++++++--------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
@@ -16,10 +16,10 @@ Subject: [PATCH 1/5] AUR Pkgbuild changes
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 12 files changed, 83 insertions(+), 39 deletions(-)
+ 12 files changed, 82 insertions(+), 39 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 83fc995d..5d0206ab 100644
+index 83fc995d..6a9c0774 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -50,11 +50,12 @@ else
@@ -133,7 +133,7 @@ index 83fc995d..5d0206ab 100644
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
  $(eval $(call rules-configure,ffmpeg,64))
-@@ -399,7 +430,11 @@ WINE_SOURCE_ARGS = \
+@@ -399,7 +430,10 @@ WINE_SOURCE_ARGS = \
    --exclude dlls/winevulkan/winevulkan.spec
  
  WINE_CONFIGURE_ARGS = \
@@ -141,11 +141,10 @@ index 83fc995d..5d0206ab 100644
 +  --with-gstreamer \
    --with-mingw \
 +  --without-oss \
-+  --disable-win16 \
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -469,6 +504,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -469,6 +503,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  DXVK_DEPENDS = glslang
  
@@ -155,7 +154,7 @@ index 83fc995d..5d0206ab 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -496,6 +534,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -496,6 +533,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
  
@@ -165,7 +164,7 @@ index 83fc995d..5d0206ab 100644
  $(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))
-@@ -570,6 +611,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -570,6 +610,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
  
@@ -175,7 +174,7 @@ index 83fc995d..5d0206ab 100644
  $(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))
-@@ -866,14 +910,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -866,14 +909,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
@@ -193,7 +192,7 @@ index 83fc995d..5d0206ab 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -883,12 +927,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -883,12 +926,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)
@@ -209,7 +208,7 @@ index 83fc995d..5d0206ab 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) \
-@@ -1014,8 +1058,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1014,8 +1057,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
@@ -220,7 +219,7 @@ index 83fc995d..5d0206ab 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1147,7 +1191,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1147,7 +1190,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
@@ -228,7 +227,7 @@ index 83fc995d..5d0206ab 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1162,9 +1205,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1162,9 +1204,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 477e2552c108..b11d3da99494 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 6b8789b0fc4ca3add44f5add0893bb748ce9e46f Mon Sep 17 00:00:00 2001
+From 9d34a1780472cbd4956dcf9e361c83bf2d8107a6 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Sun, 19 Mar 2023 10:56:59 +0200
 Subject: [PATCH 2/5] AUR Do not update cargo crates
diff --git a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
index 88848c655f47..14cf4ead01cb 100644
--- a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+++ b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -1,4 +1,4 @@
-From 13c95c2f0dd360ade1fdc4804759752f0860d862 Mon Sep 17 00:00:00 2001
+From 469f21d4b32c6e1d35a48c2b377d0a0c6207c504 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 12 Jul 2023 03:16:34 +0300
 Subject: [PATCH 3/5] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
diff --git a/0004-AUR-Strip-binaries-early.patch b/0004-AUR-Strip-binaries-early.patch
index 00cda13cf553..1bbb5ba99d67 100644
--- a/0004-AUR-Strip-binaries-early.patch
+++ b/0004-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 28d16726bd4762d166dfa2319ab18f78e4368194 Mon Sep 17 00:00:00 2001
+From 3f90fb8c65eaf7a3df73d11ef270bcec31bb977c Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 23 Aug 2023 19:31:35 +0300
 Subject: [PATCH 4/5] AUR Strip binaries early
@@ -8,7 +8,7 @@ Subject: [PATCH 4/5] AUR Strip binaries early
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 5d0206ab..6b9ee103 100644
+index 6a9c0774..e6c94872 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,7 +54,7 @@ CFLAGS         ?= -O2 -march=nocona -mtune=core-avx2
diff --git a/0005-AUR-Fix-hwnd-redefinition.patch b/0005-AUR-Fix-hwnd-redefinition.patch
index 9e2cea225dd0..66b70dc1c52e 100644
--- a/0005-AUR-Fix-hwnd-redefinition.patch
+++ b/0005-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 5bc656656ba90691c8a83e0ddb96565662d53dd0 Mon Sep 17 00:00:00 2001
+From 70d0e5a0a7b35ddd5d2c52e4409f7505fddcc7f3 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Thu, 28 Sep 2023 14:16:04 +0300
 Subject: [PATCH 5/5] AUR: Fix hwnd redefinition