Version GE-Proton7-3

author: Stelios Tsampas 2022-02-28 20:57:52 +0200
committer: Stelios Tsampas 2022-02-28 20:57:52 +0200
commit: 3a3c03420426b4552d6fde0c9b9e5ef43d21e95e (patch)
tree: de0203d49d40ce517e1e7ee5808a35a3c344ec3a
parent: e0c9c283802e49636580c96aeced097ad0ec8b30 (diff)
download: aur-3a3c03420426b4552d6fde0c9b9e5ef43d21e95e.tar.gz
4 files changed, 46 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93a84b56690d..668f1e91c70e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = proton-ge-custom
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build
-	pkgver = GE.Proton7.2
+	pkgver = GE.Proton7.3
 	pkgrel = 1
 	epoch = 2
 	url = https://github.com/GloriousEggroll/proton-ge-custom
@@ -205,7 +205,7 @@ pkgbase = proton-ge-custom
 	options = !staticlibs
 	options = !lto
 	options = emptydirs
-	source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#tag=GE-Proton7-2
+	source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#tag=GE-Proton7-3
 	source = wine-valve::git+https://github.com/ValveSoftware/wine.git
 	source = dxvk::git+https://github.com/doitsujin/dxvk.git
 	source = openvr::git+https://github.com/ValveSoftware/openvr.git
@@ -232,9 +232,11 @@ pkgbase = proton-ge-custom
 	source = protonfixes-gloriouseggroll::git+https://github.com/gloriouseggroll/protonfixes.git
 	source = gst-plugins-bad::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
 	source = gst-plugins-ugly::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly.git
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#commit=b88a829b030a1521aef63fae128f2d955270fa7a
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.tar.xz
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.tar.xz
 	source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.1.5/wine-mono-7.1.5-x86.tar.xz
+	source = https://github.com/wine-mirror/wine/commit/25946b48148784e8275c1685f6498ab88f553ca3.patch
 	source = wine-more_8x5_res.patch
 	source = proton-sanitize_makefile.patch
 	source = proton-disable_lock.patch
@@ -266,12 +268,14 @@ pkgbase = proton-ge-custom
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 8fab46ea2110b2b0beed414e3ebb4e038a3da04900e7a28492ca3c3ccf9fea94
 	sha256sums = b4476706a4c3f23461da98bed34f355ff623c5d2bb2da1e2fa0c6a310bc33014
 	sha256sums = cb03854b5d868b2d0912da42e01536bb673e009ed5263f4eeb8836a2a9c36f43
+	sha256sums = 11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b
 	sha256sums = 9005d8169266ba0b93be30e1475fe9a3697464796f553886c155ec1d77d71215
-	sha256sums = 70552bec5f83dc8c43dbfdf4746a2317de2adac2111d27aea4bd5ccb8378f874
-	sha256sums = 586eca7ba347a1b9dd84f3fcf1b8ed4ed8bf9866c6c68fb67b95e855dd5f0a78
+	sha256sums = cb6abcf9da238c541be51b812402875f9f62759001c209bdcd2b7a0a07302cc7
+	sha256sums = e5cb2054a5d23e956d7cd85c2f716c03852fe78c54ad689f2946ffe68a76c56a
 	sha256sums = 242566c092f83a71ba06c3aefe0400af65a6fa564dd63196af54403c2c4d09e2
 
 pkgname = proton-ge-custom
diff --git a/PKGBUILD b/PKGBUILD
index adc7b60831a5..ff494973d83d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-ge-custom
-_srctag=GE-Proton7-2
+_srctag=GE-Proton7-3
 _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.2
 _monover=7.1.5
+_proton_commit=b88a829b030a1521aef63fae128f2d955270fa7a
 pkgrel=1
 epoch=2
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build"
@@ -128,8 +129,10 @@ source=(
     protonfixes-gloriouseggroll::git+https://github.com/gloriouseggroll/protonfixes.git
     gst-plugins-bad::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
     gst-plugins-ugly::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly.git
+    proton::git+https://github.com/ValveSoftware/Proton.git#commit=${_proton_commit}
     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
+    https://github.com/wine-mirror/wine/commit/25946b48148784e8275c1685f6498ab88f553ca3.patch
     wine-more_8x5_res.patch
     proton-sanitize_makefile.patch
     proton-disable_lock.patch
@@ -267,12 +270,18 @@ prepare() {
         sed 's/-lldap_r/-lldap/' -i configure
         # Adds more 16:10 resolutions for use with FSR
         patch -p1 -i "$srcdir"/wine-more_8x5_res.patch
+        # Fix wldap32 compilation
+        patch -p1 -i "$srcdir"/25946b48148784e8275c1685f6498ab88f553ca3.patch
     popd
 
     patch -p1 -i "$srcdir"/proton-sanitize_makefile.patch
     patch -p1 -i "$srcdir"/proton-disable_lock.patch
     patch -p1 -i "$srcdir"/proton-user_compat_data.patch
 
+    # Copy vrclient_x64 from Proton until the repo submodule is updated
+    rm -rf vrclient_x64
+    cp -r "$srcdir"/proton/vrclient_x64 vrclient_x64
+
     # Remove repos from srcdir to save space
     for submodule in "${_submodules[@]}"; do
         rm -rf "$srcdir"/"${submodule%::*}"
@@ -280,6 +289,7 @@ prepare() {
     rm -rf "$srcdir"/dxil-spirv
     rm -rf "$srcdir"/Vulkan-Headers
     rm -rf "$srcdir"/SPIRV-Headers
+    rm -rf "$srcdir"/proton
 }
 
 build() {
@@ -354,7 +364,7 @@ package() {
     mv "$_compatdir/${pkgname}"/LICENSE{,.OFL} \
         "$pkgdir/usr/share/licenses/${pkgname}"
 
-    cd "$_compatdir/${pkgname}/dist"
+    cd "$_compatdir/${pkgname}/files"
     i686-w64-mingw32-strip --strip-unneeded \
         $(find lib/wine \( -iname fakedlls -or -iname i386-windows \) -prune -false -or -iname "*.dll" -or -iname "*.exe")
     x86_64-w64-mingw32-strip --strip-unneeded \
@@ -404,10 +414,12 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '8fab46ea2110b2b0beed414e3ebb4e038a3da04900e7a28492ca3c3ccf9fea94'
             'b4476706a4c3f23461da98bed34f355ff623c5d2bb2da1e2fa0c6a310bc33014'
             'cb03854b5d868b2d0912da42e01536bb673e009ed5263f4eeb8836a2a9c36f43'
+            '11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b'
             '9005d8169266ba0b93be30e1475fe9a3697464796f553886c155ec1d77d71215'
-            '70552bec5f83dc8c43dbfdf4746a2317de2adac2111d27aea4bd5ccb8378f874'
-            '586eca7ba347a1b9dd84f3fcf1b8ed4ed8bf9866c6c68fb67b95e855dd5f0a78'
+            'cb6abcf9da238c541be51b812402875f9f62759001c209bdcd2b7a0a07302cc7'
+            'e5cb2054a5d23e956d7cd85c2f716c03852fe78c54ad689f2946ffe68a76c56a'
             '242566c092f83a71ba06c3aefe0400af65a6fa564dd63196af54403c2c4d09e2')
diff --git a/proton-disable_lock.patch b/proton-disable_lock.patch
index 83d028eb1e90..284e500d6147 100644
--- a/proton-disable_lock.patch
+++ b/proton-disable_lock.patch
@@ -1,5 +1,5 @@
 diff --git a/proton b/proton
-index ab6daa11..a1fe3dd2 100755
+index 0e8e59e7..426ef35d 100755
 --- a/proton
 +++ b/proton
 @@ -345,7 +345,6 @@ class Proton:
@@ -10,15 +10,16 @@ index ab6daa11..a1fe3dd2 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1529,7 +1528,6 @@ if __name__ == "__main__":
+@@ -1538,8 +1537,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
+-    g_proton.cleanup_legacy_dist()
 -    g_proton.do_steampipe_fixups()
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1542,7 +1540,8 @@ if __name__ == "__main__":
+@@ -1548,7 +1545,8 @@ if __name__ == "__main__":
      g_session.init_wine()
  
      if g_proton.missing_default_prefix():
diff --git a/proton-sanitize_makefile.patch b/proton-sanitize_makefile.patch
index 9ffaf900b0d0..b03b58404800 100644
--- a/proton-sanitize_makefile.patch
+++ b/proton-sanitize_makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile.in b/Makefile.in
-index 1c4fd7d4..4574b32d 100644
+index 2b2ff92b..ef9dc2e7 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -63,7 +63,6 @@ ifeq ($(ENABLE_CCACHE),1)
@@ -34,7 +34,7 @@ index 1c4fd7d4..4574b32d 100644
  CARGO_BUILD_ARG := --release
  
  ##
-@@ -369,8 +369,8 @@ ALL_TARGETS += dist
+@@ -366,8 +366,8 @@ ALL_TARGETS += dist
  GOAL_TARGETS += dist
  
  dist_prefix: wine gst_good gst_libav gst_plugins_rs
@@ -45,7 +45,7 @@ index 1c4fd7d4..4574b32d 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) $(STEAM_RUNTIME_RUNSH)
  
-@@ -449,11 +449,15 @@ $(eval $(call rules-meson,dav1d,64))
+@@ -437,11 +437,15 @@ $(eval $(call rules-meson,dav1d,64))
  ##
  
  GST_COMMON_MESON_ARGS := \
@@ -61,7 +61,7 @@ index 1c4fd7d4..4574b32d 100644
  	-Dglib-asserts=disabled \
  	-Dglib-checks=disabled \
  	-Dnls=disabled \
-@@ -477,6 +481,8 @@ GSTREAMER_MESON_ARGS := \
+@@ -465,6 +469,8 @@ GSTREAMER_MESON_ARGS := \
  	-Dbenchmarks=disabled \
  	-Dtools=disabled \
  	-Dbash-completion=disabled \
@@ -70,7 +70,7 @@ index 1c4fd7d4..4574b32d 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GSTREAMER_DEPENDS = gst_orc
-@@ -513,6 +519,7 @@ GST_BASE_MESON_ARGS := \
+@@ -501,6 +507,7 @@ GST_BASE_MESON_ARGS := \
  	-Dx11=disabled \
  	-Dxshm=disabled \
  	-Dxvideo=disabled \
@@ -78,7 +78,7 @@ index 1c4fd7d4..4574b32d 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_BASE_DEPENDS = gst_orc gstreamer
-@@ -576,7 +583,7 @@ GST_GOOD_MESON_ARGS := \
+@@ -564,7 +571,7 @@ GST_GOOD_MESON_ARGS := \
  	-Dwavenc=disabled \
  	-Dximagesrc=disabled \
  	-Dy4m=enabled \
@@ -87,7 +87,7 @@ index 1c4fd7d4..4574b32d 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_GOOD_DEPENDS = gst_orc gstreamer gst_base
-@@ -592,6 +599,8 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -579,6 +586,8 @@ $(eval $(call rules-meson,gst_good,64))
  
  GST_LIBAV_MESON_ARGS := \
          -Ddoc=disabled \
@@ -96,7 +96,7 @@ index 1c4fd7d4..4574b32d 100644
      $(GST_COMMON_MESON_ARGS)
  
  GST_LIBAV_DEPENDS = gst_orc gstreamer gst_base
-@@ -661,6 +670,8 @@ GST_BAD_MESON_ARGS := \
+@@ -648,6 +657,8 @@ GST_BAD_MESON_ARGS := \
  	-Dvoamrwbenc=disabled \
  	-Dnvcodec=disabled \
  	-Dx265=disabled \
@@ -105,7 +105,7 @@ index 1c4fd7d4..4574b32d 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_BAD_DEPENDS = gst_orc gstreamer gst_base
-@@ -675,6 +686,7 @@ $(eval $(call rules-meson,gst_bad,64))
+@@ -662,6 +673,7 @@ $(eval $(call rules-meson,gst_bad,64))
  
  GST_UGLY_MESON_ARGS := \
          -Ddoc='disabled' \
@@ -113,7 +113,7 @@ index 1c4fd7d4..4574b32d 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_UGLY_DEPENDS = gst_orc gstreamer gst_base
-@@ -806,7 +818,13 @@ WINE_SOURCE_ARGS = \
+@@ -793,7 +805,13 @@ WINE_SOURCE_ARGS = \
    --exclude include/config.h.in \
  
  WINE_CONFIGURE_ARGS = \
@@ -127,7 +127,7 @@ index 1c4fd7d4..4574b32d 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS64 = --enable-win64
-@@ -869,6 +887,9 @@ $(OBJ)/.vrclient-post-source:
+@@ -860,6 +878,9 @@ $(OBJ)/.vrclient-post-source:
  DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  
@@ -137,7 +137,7 @@ index 1c4fd7d4..4574b32d 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -891,6 +912,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -882,6 +903,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
  
@@ -147,7 +147,7 @@ index 1c4fd7d4..4574b32d 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))
-@@ -954,10 +978,13 @@ VKD3D_PROTON_SOURCE_ARGS = \
+@@ -945,10 +969,13 @@ VKD3D_PROTON_SOURCE_ARGS = \
    --exclude vkd3d_build.h.in \
    --exclude vkd3d_version.h.in \
  
@@ -231,10 +231,10 @@ index c70751a2..1096dc19 100644
  endif
  endef
 diff --git a/make/rules-common.mk b/make/rules-common.mk
-index ec083690..55978ca7 100644
+index 9f246e69..81a2f85d 100644
 --- a/make/rules-common.mk
 +++ b/make/rules-common.mk
-@@ -119,8 +119,12 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
+@@ -113,8 +113,12 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
  # native version doesn't exist.
  
  $(2)_ENV$(3) = \
@@ -247,7 +247,7 @@ index ec083690..55978ca7 100644
      CCACHE_BASEDIR="$$(CCACHE_BASEDIR)" \
      STRIP="$$(STRIP)" \
      AR="$$(TARGET_$(4)$(3))-ar" \
-@@ -134,7 +138,7 @@ $(2)_ENV$(3) = \
+@@ -128,7 +132,7 @@ $(2)_ENV$(3) = \
      PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$(SRC)/glslang/bin:$$$$PATH" \
      LD_LIBRARY_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))),,:)$$$$LD_LIBRARY_PATH" \
      PKG_CONFIG_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))/pkgconfig))" \
@@ -256,7 +256,7 @@ index ec083690..55978ca7 100644
      CFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
      CPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
      CXXFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)) -std=c++17" \
-@@ -158,7 +162,7 @@ $(2)_ENV$(3) += \
+@@ -152,7 +156,7 @@ $(2)_ENV$(3) += \
      CROSSCPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
      CROSSCXXFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)) -std=c++17" \
      CROSSLDFLAGS="$$($(2)_LIBFLAGS$(3)) $$($(2)_LDFLAGS$(3)) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \
@@ -265,7 +265,7 @@ index ec083690..55978ca7 100644
  
  endif
  
-@@ -171,14 +175,14 @@ else
+@@ -165,14 +169,14 @@ else
  install-strip = objcopy --file-alignment=4096 --strip-debug $(1) $(2)/$(notdir $(1)) && rm -f $(2)/$(notdir $(1)).debug
  endif
author	Stelios Tsampas	2022-02-28 20:57:52 +0200
committer	Stelios Tsampas	2022-02-28 20:57:52 +0200
commit	3a3c03420426b4552d6fde0c9b9e5ef43d21e95e (patch)
tree	de0203d49d40ce517e1e7ee5808a35a3c344ec3a
parent	e0c9c283802e49636580c96aeced097ad0ec8b30 (diff)
download	aur-3a3c03420426b4552d6fde0c9b9e5ef43d21e95e.tar.gz