Version GE-Proton7-4

3 files changed, 17 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 668f1e91c70e..7029d72fd7c6 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.3
+	pkgver = GE.Proton7.4
 	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-3
+	source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#tag=GE-Proton7-4
 	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
@@ -222,21 +222,17 @@ pkgbase = proton-ge-custom
 	source = SPIRV-Headers::git+https://github.com/KhronosGroup/SPIRV-Headers.git
 	source = Vulkan-Loader::git+https://github.com/KhronosGroup/Vulkan-Loader.git
 	source = gst-libav::git+https://gitlab.freedesktop.org/gstreamer/gst-libav.git
-	source = ffmpeg-meson::git+https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
+	source = ffmpeg::git+https://git.ffmpeg.org/ffmpeg.git
 	source = dav1d::git+https://code.videolan.org/videolan/dav1d.git
 	source = gst-plugins-rs::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
 	source = dxil-spirv::git+https://github.com/HansKristian-Work/dxil-spirv.git
 	source = wine-staging::git+https://github.com/wine-staging/wine-staging.git
-	source = lsteamclient-gloriouseggroll::git+https://github.com/gloriouseggroll/lsteamclient.git
-	source = vrclient_x64-gloriouseggroll::git+https://github.com/gloriouseggroll/vrclient_x64.git
 	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,15 +262,11 @@ pkgbase = proton-ge-custom
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = 8fab46ea2110b2b0beed414e3ebb4e038a3da04900e7a28492ca3c3ccf9fea94
 	sha256sums = b4476706a4c3f23461da98bed34f355ff623c5d2bb2da1e2fa0c6a310bc33014
 	sha256sums = cb03854b5d868b2d0912da42e01536bb673e009ed5263f4eeb8836a2a9c36f43
-	sha256sums = 11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b
 	sha256sums = 9005d8169266ba0b93be30e1475fe9a3697464796f553886c155ec1d77d71215
-	sha256sums = cb6abcf9da238c541be51b812402875f9f62759001c209bdcd2b7a0a07302cc7
+	sha256sums = c6c640110fcb194b512ed94f4ec40cbf560cd4df5e9993fb821da3ca5b771297
 	sha256sums = e5cb2054a5d23e956d7cd85c2f716c03852fe78c54ad689f2946ffe68a76c56a
 	sha256sums = 242566c092f83a71ba06c3aefe0400af65a6fa564dd63196af54403c2c4d09e2
 
diff --git a/PKGBUILD b/PKGBUILD
index ff494973d83d..df6a3572f72f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,11 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-ge-custom
-_srctag=GE-Proton7-3
+_srctag=GE-Proton7-4
 _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"
@@ -119,20 +118,16 @@ source=(
     SPIRV-Headers::git+https://github.com/KhronosGroup/SPIRV-Headers.git
     Vulkan-Loader::git+https://github.com/KhronosGroup/Vulkan-Loader.git
     gst-libav::git+https://gitlab.freedesktop.org/gstreamer/gst-libav.git
-    ffmpeg-meson::git+https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
+    ffmpeg::git+https://git.ffmpeg.org/ffmpeg.git
     dav1d::git+https://code.videolan.org/videolan/dav1d.git
     gst-plugins-rs::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
     dxil-spirv::git+https://github.com/HansKristian-Work/dxil-spirv.git
     wine-staging::git+https://github.com/wine-staging/wine-staging.git
-    lsteamclient-gloriouseggroll::git+https://github.com/gloriouseggroll/lsteamclient.git
-    vrclient_x64-gloriouseggroll::git+https://github.com/gloriouseggroll/vrclient_x64.git
     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
@@ -215,12 +210,10 @@ prepare() {
         SPIRV-Headers
         Vulkan-Loader
         gst-libav
-        ffmpeg-meson::FFmpeg
+        ffmpeg::FFmpeg
         dav1d
         gst-plugins-rs
         wine-staging
-        lsteamclient-gloriouseggroll::lsteamclient
-        vrclient_x64-gloriouseggroll::vrclient_x64
         protonfixes-gloriouseggroll::protonfixes
         gst-plugins-bad
         gst-plugins-ugly
@@ -270,18 +263,12 @@ 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%::*}"
@@ -289,7 +276,6 @@ prepare() {
     rm -rf "$srcdir"/dxil-spirv
     rm -rf "$srcdir"/Vulkan-Headers
     rm -rf "$srcdir"/SPIRV-Headers
-    rm -rf "$srcdir"/proton
 }
 
 build() {
@@ -412,14 +398,10 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
             '8fab46ea2110b2b0beed414e3ebb4e038a3da04900e7a28492ca3c3ccf9fea94'
             'b4476706a4c3f23461da98bed34f355ff623c5d2bb2da1e2fa0c6a310bc33014'
             'cb03854b5d868b2d0912da42e01536bb673e009ed5263f4eeb8836a2a9c36f43'
-            '11aa65bb6b8da1814557edf18a3cdada80135b021634236feabf93d2a194838b'
             '9005d8169266ba0b93be30e1475fe9a3697464796f553886c155ec1d77d71215'
-            'cb6abcf9da238c541be51b812402875f9f62759001c209bdcd2b7a0a07302cc7'
+            'c6c640110fcb194b512ed94f4ec40cbf560cd4df5e9993fb821da3ca5b771297'
             'e5cb2054a5d23e956d7cd85c2f716c03852fe78c54ad689f2946ffe68a76c56a'
             '242566c092f83a71ba06c3aefe0400af65a6fa564dd63196af54403c2c4d09e2')
diff --git a/proton-sanitize_makefile.patch b/proton-sanitize_makefile.patch
index b03b58404800..cd72cb4c0382 100644
--- a/proton-sanitize_makefile.patch
+++ b/proton-sanitize_makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile.in b/Makefile.in
-index 2b2ff92b..ef9dc2e7 100644
+index 89c3b76d..6706253b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -63,7 +63,6 @@ ifeq ($(ENABLE_CCACHE),1)
@@ -87,16 +87,7 @@ index 2b2ff92b..ef9dc2e7 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_GOOD_DEPENDS = gst_orc gstreamer gst_base
-@@ -579,6 +586,8 @@ $(eval $(call rules-meson,gst_good,64))
- 
- GST_LIBAV_MESON_ARGS := \
-         -Ddoc=disabled \
-+        -Dtools=disabled \
-+        --force-fallback-for=FFmpeg \
-     $(GST_COMMON_MESON_ARGS)
- 
- GST_LIBAV_DEPENDS = gst_orc gstreamer gst_base
-@@ -648,6 +657,8 @@ GST_BAD_MESON_ARGS := \
+@@ -657,6 +664,8 @@ GST_BAD_MESON_ARGS := \
  	-Dvoamrwbenc=disabled \
  	-Dnvcodec=disabled \
  	-Dx265=disabled \
@@ -105,7 +96,7 @@ index 2b2ff92b..ef9dc2e7 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_BAD_DEPENDS = gst_orc gstreamer gst_base
-@@ -662,6 +673,7 @@ $(eval $(call rules-meson,gst_bad,64))
+@@ -671,6 +680,7 @@ $(eval $(call rules-meson,gst_bad,64))
  
  GST_UGLY_MESON_ARGS := \
          -Ddoc='disabled' \
@@ -113,7 +104,7 @@ index 2b2ff92b..ef9dc2e7 100644
  	$(GST_COMMON_MESON_ARGS)
  
  GST_UGLY_DEPENDS = gst_orc gstreamer gst_base
-@@ -793,7 +805,13 @@ WINE_SOURCE_ARGS = \
+@@ -802,7 +812,13 @@ WINE_SOURCE_ARGS = \
    --exclude include/config.h.in \
  
  WINE_CONFIGURE_ARGS = \
@@ -127,7 +118,7 @@ index 2b2ff92b..ef9dc2e7 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS64 = --enable-win64
-@@ -860,6 +878,9 @@ $(OBJ)/.vrclient-post-source:
+@@ -869,6 +885,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 +128,7 @@ index 2b2ff92b..ef9dc2e7 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -882,6 +903,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -891,6 +910,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 +138,7 @@ index 2b2ff92b..ef9dc2e7 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))
-@@ -945,10 +969,13 @@ VKD3D_PROTON_SOURCE_ARGS = \
+@@ -954,10 +976,13 @@ VKD3D_PROTON_SOURCE_ARGS = \
    --exclude vkd3d_build.h.in \
    --exclude vkd3d_version.h.in \
  
@@ -231,7 +222,7 @@ index c70751a2..1096dc19 100644
  endif
  endef
 diff --git a/make/rules-common.mk b/make/rules-common.mk
-index 9f246e69..81a2f85d 100644
+index 9f246e69..d8bc33c1 100644
 --- a/make/rules-common.mk
 +++ b/make/rules-common.mk
 @@ -113,8 +113,12 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
@@ -240,7 +231,7 @@ index 9f246e69..81a2f85d 100644
  $(2)_ENV$(3) = \
 +    WINEDEBUG="-all" \
 +    WINEPREFIX="$$(OBJ)/pfx-wine$(3)" \
-+    WINEDLLOVERRIDES="winemenubuilder=d;mscoree=d;mshtml=d" \
++    WINEDLLOVERRIDES="winemenubuilder=d;" \
      CARGO_HOME=$$(OBJ)/.cargo \
      CARGO_TARGET_$$(call toupper,$$(CARGO_TARGET_$(3)))_LINKER="$$(TARGET_$(4)$(3))-gcc" \
 +    CARGO_TARGET_$$(call toupper,$$(CARGO_TARGET_$(3)))_RUSTFLAGS="$$(RUSTFLAGS)" \