proton-cachy: Update nvidia-reflex patches, fixup compilation, update…

… branch to bleeding edge Signed-off-by: Peter Jung <admin@ptr1337.dev>
CachyOS · Feb 16, 2024 · c09fd8f · c09fd8f
1 parent ade8437
commit c09fd8f
Show file tree

Hide file tree

Showing 10 changed files with 1,142 additions and 536 deletions.
diff --git a/proton-cachyos/.SRCINFO b/proton-cachyos/.SRCINFO
@@ -86,8 +86,8 @@ pkgbase = proton-cachyos
 	makedepends = lib32-libxkbcommon
 	makedepends = libvpx
 	makedepends = lib32-libvpx
-	makedepends = sdl2>=2.0.16
-	makedepends = lib32-sdl2>=2.0.16
+	makedepends = sdl2
+	makedepends = lib32-sdl2
 	makedepends = libsoup
 	makedepends = lib32-libsoup
 	makedepends = libgudev
@@ -126,8 +126,8 @@ pkgbase = proton-cachyos
 	depends = lib32-libxkbcommon
 	depends = libvpx
 	depends = lib32-libvpx
-	depends = sdl2>=2.0.16
-	depends = lib32-sdl2>=2.0.16
+	depends = sdl2
+	depends = lib32-sdl2
 	depends = libsoup
 	depends = lib32-libsoup
 	depends = libgudev
@@ -175,7 +175,7 @@ pkgbase = proton-cachyos
 	options = !lto
 	options = !debug
 	options = emptydirs
-	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-8.0-20231219
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-bleeding-edge-8.0-80590-20240215-p002645-w191c4e-d9491b5-ve64116
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.4/wine-gecko-2.47.4-x86.tar.xz
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.4/wine-gecko-2.47.4-x86_64.tar.xz
 	source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-8.1.0/wine-mono-8.1.0-x86.tar.xz
@@ -199,19 +199,19 @@ pkgbase = proton-cachyos
 	sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
 	sha256sums = 4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4
-	sha256sums = 9dffdab7d53dc81ab82ba86d1f4baa8f85b1fe0410ece76b89295b09aab7fbe0
-	sha256sums = f16e8271169cbaca1111e925a02bd0d1dfcfd6a0941435b724734b626689f6c6
+	sha256sums = facdd6c59e93f5f0877ba1e68a1f5f90f8cd8333e6fba863760ddfa49330753c
+	sha256sums = 0ad87e3ca616120ec490361df41e24b445a62ad4f9652b048d156c4859f4a2f6
 	sha256sums = 369193510b9309fc9cb80fc204220599583677a59976c7f434c2a33871b0cbe1
-	sha256sums = 42c869c47a3079087125efa94d786c5942cbd518a7ab087770a5c19d2007e0d6
-	sha256sums = 0892daec01d88ae497d1389673931f5aa1a93de56b24eeee6a6beaefcee8943c
-	sha256sums = c589f9bf60c27033680036a048374632001eddf8a9ca2277c7ed5893263c2ac9
-	sha256sums = eefb327133ee164db6d8002a851b8fad72f9fc2e669f1d58901ebdadbc240823
+	sha256sums = e76d56f97a795f143ecd718229b9af8a5e2a4d1daffa6e35a26bc68c1c22f68e
+	sha256sums = a5429443e20a2b5d5f1e90626741b264bac036556202f99c691637815785c989
+	sha256sums = 73fabb8d30e174e57ac864a5ec7a3bc6bcd0fd917db4094d3b9ad807ca69a411
+	sha256sums = db9f7cca780b4e4225e1cc75501cd348878112936cdc5c832caa8e4dd6614e1a
 	sha256sums = d84f6530acd6d6480fa15cc566665ca2a5af98dbe1b66b4a9295bd186a685585
 	sha256sums = 2f30e393b5e6c371a68ad6b5b6693d35412d30ba7e3963bc65a650c9c29ff569
-	sha256sums = 6464b6a08aa8b117e7395e3a0dcf8d7434936962e790505143446557a7f1d2da
+	sha256sums = ceff1ff8de8bc25729cc7928eb46d16ef4c2f49ef3eb2e47ce3134337ca7107e
 	sha256sums = ac757218883c65f563e5a211dfbc1be477b9f39e0bba5cd89ae2c867619e5ce3
 	sha256sums = 80322501d28cc3f288fe206e4e943b5b8a579993f15227ad4f7ce5d879af0d54
-	sha256sums = cda9aee7a4cb76a4c85705ccc9c06df0c0e982080111eb884246abfa97d1253a
+	sha256sums = 21b854b0a78a142c182faabeaed140abeaee88d754fe5ce84a63433a71fd67ed
 	sha256sums = 08af47c4597b9cb5e7984eb7e273d03ba7c205eb4a72f4f91329e5e1d60e90a7
 	sha256sums = 23e35740995ada449865b0b5129e8177e995d28842a924be4562e65d6513bafd
 	sha256sums = bd0482c05474068bb50a176eb33c02a1eb3ac1bece0365ee0dd3bcd304fabf9e

diff --git a/proton-cachyos/0001-AUR-Pkgbuild-changes.patch b/proton-cachyos/0001-AUR-Pkgbuild-changes.patch
@@ -1,26 +1,26 @@
-From 51d4010480d581842ac324415f24b4b8a6a657d2 Mon Sep 17 00:00:00 2001
+From 3056186c67e1708550d8321843650a106a88d776 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/6] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 74 ++++++++++++++++++++++++++--------
+ Makefile.in                    | 75 ++++++++++++++++++++++++++--------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
  make/rules-cargo.mk            |  4 +-
  make/rules-cmake.mk            |  4 +-
- make/rules-common.mk           | 18 +++++----
+ make/rules-common.mk           | 18 ++++----
  make/rules-configure.mk        |  4 +-
  make/rules-makedep.mk          |  4 +-
  make/rules-meson.mk            |  3 +-
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 13 files changed, 88 insertions(+), 42 deletions(-)
+ 13 files changed, 89 insertions(+), 42 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 7ec939df..32211119 100644
+index 7ec939df..3636f22c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -50,11 +50,12 @@ else
@@ -164,7 +164,12 @@ index 7ec939df..32211119 100644
    --disable-tests
 
  WINE_CONFIGURE_ARGS32 = \
-@@ -527,6 +564,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -523,10 +560,14 @@ $(eval $(call rules-makedep,vrclient,64))
+ ## dxvk
+ ##
+
++DXVK_MESON_ARGS = --force-fallback-for=libdisplay-info
+ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  DXVK_DEPENDS = glslang
 
@@ -174,7 +179,7 @@ index 7ec939df..32211119 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -554,6 +594,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -554,6 +595,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
 
@@ -184,7 +189,7 @@ index 7ec939df..32211119 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))
-@@ -628,6 +671,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -628,6 +672,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
 
@@ -194,7 +199,7 @@ index 7ec939df..32211119 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))
-@@ -924,14 +970,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -924,14 +971,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
@@ -212,7 +217,7 @@ index 7ec939df..32211119 100644
  	mv $@.tmp $@
 
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -941,12 +987,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -941,12 +988,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)
@@ -228,7 +233,7 @@ index 7ec939df..32211119 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) \
-@@ -1072,8 +1118,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1072,8 +1119,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
@@ -239,15 +244,15 @@ index 7ec939df..32211119 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
 
-@@ -1205,7 +1251,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1205,7 +1252,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
 -	export CCACHE_DISABLE := 1
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
 
-@@ -1220,9 +1265,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1220,9 +1266,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
 
@@ -459,7 +464,7 @@ index 5c3b59a3..ed6589e0 100644
  	winebuild --$(lastword $(subst ., ,$(4))) --fake-module -E "$(basename $(4)).spec" -o "$(4).fake"
  	mkdir -p $$($(2)_LIBDIR$(3))/$(LIBDIR_WINE_$(3))
 diff --git a/proton b/proton
-index f93f545f..e4713eec 100755
+index 2faa16b6..87b13577 100755
 --- a/proton
 +++ b/proton
 @@ -423,7 +423,6 @@ class Proton:
@@ -470,7 +475,7 @@ index f93f545f..e4713eec 100755
 
      def path(self, d):
          return self.base_dir + d
-@@ -1742,8 +1741,6 @@ if __name__ == "__main__":
+@@ -1752,8 +1751,6 @@ if __name__ == "__main__":
 
      g_proton = Proton(os.path.dirname(sys.argv[0]))
 
@@ -479,7 +484,7 @@ index f93f545f..e4713eec 100755
 
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
 
-@@ -1752,7 +1749,8 @@ if __name__ == "__main__":
+@@ -1762,7 +1759,8 @@ if __name__ == "__main__":
      g_session.init_wine()
 
      if g_proton.missing_default_prefix():
@@ -502,5 +507,5 @@ index beddcbbb..b6f36788 100644
 -  "compatmanager_layer_name" "proton"
  }
 -- 
-2.43.0
+2.43.1
 
diff --git a/proton-cachyos/0002-AUR-Do-not-update-cargo-crates.patch b/proton-cachyos/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 81224ebacaefd19d894afbcde000bda0745ec32b Mon Sep 17 00:00:00 2001
+From 8f433c2161a800e24dcc7c5dd9adb48dad2d6745 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/6] AUR Do not update cargo crates
@@ -21,5 +21,5 @@ index 00fa99fc..225ab528 100644
  	      -j$$(SUBJOBS) --locked --offline --verbose \
  	      --target "$$(CARGO_TARGET_$(3))" \
 -- 
-2.43.0
+2.43.1
 
diff --git a/proton-cachyos/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch b/proton-cachyos/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
@@ -1,4 +1,4 @@
-From 4141a175920b6bb81d589141a04185b9a25509a8 Mon Sep 17 00:00:00 2001
+From 9c69ddbb3082515a94761f1aef10542d4a92c3ac Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 12 Jul 2023 17:53:47 +0300
 Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of
@@ -9,7 +9,7 @@ Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of
  1 file changed, 1 insertion(+), 81 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 32211119..1f196b49 100644
+index 3636f22c..ea505e39 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -403,86 +403,6 @@ $(OBJ)/.steamexe-post-build64:
@@ -109,5 +109,5 @@ index 32211119..1f196b49 100644
  $(eval $(call rules-source,wine,$(SRCDIR)/wine))
  $(eval $(call rules-autoconf,wine,32))
 -- 
-2.43.0
+2.43.1
 
diff --git a/proton-cachyos/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/proton-cachyos/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -1,4 +1,4 @@
-From 98c97d55154566292875f73c05e0062a95dee02b Mon Sep 17 00:00:00 2001
+From 70c31f5f82163bbf18cb8338e14f80b9de78b620 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 12 Jul 2023 03:16:34 +0300
 Subject: [PATCH 4/6] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
@@ -20,10 +20,10 @@ a runtime dependency.
  1 file changed, 9 insertions(+)
 
 diff --git a/proton b/proton
-index e4713eec..b489aa96 100755
+index 87b13577..8d13f941 100755
 --- a/proton
 +++ b/proton
-@@ -918,6 +918,15 @@ class CompatData:
+@@ -921,6 +921,15 @@ class CompatData:
                          prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
                  try_copy(g_proton.lib_dir + "vkd3d/libvkd3d-shader-1.dll", "drive_c/windows/syswow64",
                          prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
@@ -40,5 +40,5 @@ index e4713eec..b489aa96 100755
                  if use_wined3d:
                      dxvkfiles = []
 -- 
-2.43.0
+2.43.1
 
diff --git a/proton-cachyos/0005-AUR-Strip-binaries-early.patch b/proton-cachyos/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 230c3144ea0894e9b0e692cef5b913801b967ff7 Mon Sep 17 00:00:00 2001
+From c8de8d2e84662b3eca41111d84a3d74bc363a955 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 23 Aug 2023 19:31:35 +0300
 Subject: [PATCH 5/6] AUR Strip binaries early
@@ -8,7 +8,7 @@ Subject: [PATCH 5/6] AUR Strip binaries early
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 1f196b49..b70e1e48 100644
+index ea505e39..892d78b1 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,7 +54,7 @@ CFLAGS         ?= -O2 -march=nocona -mtune=core-avx2
@@ -21,5 +21,5 @@ index 1f196b49..b70e1e48 100644
  COMMON_FLAGS64 := -mcmodel=small
  CARGO_BUILD_ARGS += --release
 -- 
-2.43.0
+2.43.1
 
diff --git a/proton-cachyos/0006-AUR-Fix-hwnd-redefinition.patch b/proton-cachyos/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From d898a375310be217a70b818b772ccdd375716b85 Mon Sep 17 00:00:00 2001
+From 9def0147d49fc860d0ba590bd1e7f90fe8a8e410 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Thu, 28 Sep 2023 14:16:04 +0300
 Subject: [PATCH 6/6] AUR: Fix hwnd redefinition
@@ -48,5 +48,5 @@ index 627fbbb4..3b3ccf15 100644
 
  WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
 -- 
-2.43.0
+2.43.1
 
diff --git a/proton-cachyos/PKGBUILD b/proton-cachyos/PKGBUILD
@@ -7,7 +7,7 @@ _optimize=${_optimize-y}
 _optimize_v4=${_optimize_v4-}
 
 pkgname=proton-cachyos
-_srctag=8.0-20231219
+_srctag=8.0-80590-20240215-p002645-w191c4e-d9491b5-ve64116
 _commit=
 pkgver=8.0
 # pkgver=${_srctag//-/.}
@@ -33,7 +33,7 @@ depends=(
   lzo              lib32-lzo
   libxkbcommon     lib32-libxkbcommon
   libvpx           lib32-libvpx
-  'sdl2>=2.0.16'   'lib32-sdl2>=2.0.16'
+  sdl2             lib32-sdl2
   libsoup          lib32-libsoup
   libgudev         lib32-libgudev
   blas             lib32-blas
@@ -92,7 +92,7 @@ makedepends=(${makedepends[@]} ${depends[@]})
 provides=('proton')
 install=${pkgname}.install
 source=(
-    proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-${_srctag}
+    proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-bleeding-edge-${_srctag}
     https://dl.winehq.org/wine/wine-gecko/${_geckover}/wine-gecko-${_geckover}-x86{,_64}.tar.xz
     https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
     0001-AUR-Pkgbuild-changes.patch
@@ -198,20 +198,21 @@ prepare() {
     cd $srcdir/proton/dxvk
     echo "dxvk: Enable Reflex"
     patch -Np1 -i "$srcdir"/dxvk-reflex.patch
-    patch -Np1 -i "$srcdir"/dxvk-reflex-lockfix.patch
+#    patch -Np1 -i "$srcdir"/dxvk-reflex-lockfix.patch
     echo "dxvk-nvapi: Enable Reflex"
     cd $srcdir/proton/dxvk-nvapi
+    git checkout 0a7c48b256cafe6b3fa1db8183f089712c72e9ad
     patch -Np1 -i "$srcdir"/nvapi-reflex.patch
 
     echo "vkd3d-proton: Enable-Reflex"
     cd $srcdir/proton/vkd3d-proton
     patch -Np1 -i "$srcdir"/vkd3d-reflex.patch
 
     cd $srcdir/proton/dxvk/include/vulkan
-    git checkout bbe0f575ebd6098369f0ac6c6a43532732ed0ba6
+    git checkout 5a5c9a643484d888873e32c5d7d484fae8e71d3d
     echo "Update Vulkan Headers for vkd3d-proton"
     cd $srcdir/proton/vkd3d-proton/khronos/Vulkan-Headers
-    git checkout bbe0f575ebd6098369f0ac6c6a43532732ed0ba6
+    git checkout 5a5c9a643484d888873e32c5d7d484fae8e71d3d
 
 }
 
@@ -305,19 +306,19 @@ sha256sums=('SKIP'
             '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
             '4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4'
-            '9dffdab7d53dc81ab82ba86d1f4baa8f85b1fe0410ece76b89295b09aab7fbe0'
-            'f16e8271169cbaca1111e925a02bd0d1dfcfd6a0941435b724734b626689f6c6'
+            'facdd6c59e93f5f0877ba1e68a1f5f90f8cd8333e6fba863760ddfa49330753c'
+            '0ad87e3ca616120ec490361df41e24b445a62ad4f9652b048d156c4859f4a2f6'
             '369193510b9309fc9cb80fc204220599583677a59976c7f434c2a33871b0cbe1'
-            '42c869c47a3079087125efa94d786c5942cbd518a7ab087770a5c19d2007e0d6'
-            '0892daec01d88ae497d1389673931f5aa1a93de56b24eeee6a6beaefcee8943c'
-            'c589f9bf60c27033680036a048374632001eddf8a9ca2277c7ed5893263c2ac9'
-            'eefb327133ee164db6d8002a851b8fad72f9fc2e669f1d58901ebdadbc240823'
+            'e76d56f97a795f143ecd718229b9af8a5e2a4d1daffa6e35a26bc68c1c22f68e'
+            'a5429443e20a2b5d5f1e90626741b264bac036556202f99c691637815785c989'
+            '73fabb8d30e174e57ac864a5ec7a3bc6bcd0fd917db4094d3b9ad807ca69a411'
+            'db9f7cca780b4e4225e1cc75501cd348878112936cdc5c832caa8e4dd6614e1a'
             'd84f6530acd6d6480fa15cc566665ca2a5af98dbe1b66b4a9295bd186a685585'
             '2f30e393b5e6c371a68ad6b5b6693d35412d30ba7e3963bc65a650c9c29ff569'
-            '6464b6a08aa8b117e7395e3a0dcf8d7434936962e790505143446557a7f1d2da'
+            'ceff1ff8de8bc25729cc7928eb46d16ef4c2f49ef3eb2e47ce3134337ca7107e'
             'ac757218883c65f563e5a211dfbc1be477b9f39e0bba5cd89ae2c867619e5ce3'
             '80322501d28cc3f288fe206e4e943b5b8a579993f15227ad4f7ce5d879af0d54'
-            'cda9aee7a4cb76a4c85705ccc9c06df0c0e982080111eb884246abfa97d1253a'
+            '21b854b0a78a142c182faabeaed140abeaee88d754fe5ce84a63433a71fd67ed'
             '08af47c4597b9cb5e7984eb7e273d03ba7c205eb4a72f4f91329e5e1d60e90a7'
             '23e35740995ada449865b0b5129e8177e995d28842a924be4562e65d6513bafd'
             'bd0482c05474068bb50a176eb33c02a1eb3ac1bece0365ee0dd3bcd304fabf9e')