upstream hotfix (will this ever end?)

4 files changed, 29 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38c387188af8..4ba5675c209d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = proton-ge-custom-bin
 	pkgdesc = A fancy custom distribution of Valves Proton with various patches
-	pkgver = GE_Proton7_3
+	pkgver = GE_Proton7_4
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/GloriousEggroll/proton-ge-custom
@@ -14,15 +14,12 @@ pkgbase = proton-ge-custom-bin
 	license = custom
 	depends = python
 	depends = vulkan-icd-loader
-	depends = lib32-libusb
 	depends = lib32-openal
-	depends = lib32-sdl2
-	depends = lib32-v4l-utils
-	depends = lib32-jack
 	depends = lib32-libva
 	depends = ffmpeg4.4
 	depends = lib32-speex
 	depends = lib32-libtheora
+	depends = lib32-libvdpau
 	depends = gst-plugins-bad-libs
 	depends = lib32-gst-plugins-base-libs
 	depends = libjpeg6-turbo
@@ -39,15 +36,16 @@ pkgbase = proton-ge-custom-bin
 	optdepends = winetricks: protonfixes backend - highly recommended
 	optdepends = wine: support for 32bit prefixes
 	optdepends = xboxdrv: gamepad driver service
+	optdepends = lib32-libusb: wine usb support
 	provides = proton
-	provides = proton-ge-custom=GE.Proton7_3
+	provides = proton-ge-custom=GE.Proton7_4
 	conflicts = proton-ge-custom-legacy-bin
 	conflicts = proton-ge-custom
 	options = !strip
 	backup = usr/share/steam/compatibilitytools.d/proton-ge-custom/user_settings.py
-	source = GE-Proton7-3_1.tar.gz::https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-3/GE-Proton7-3.tar.gz
+	source = GE-Proton7-4_1.tar.gz::https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-4/GE-Proton7-4.tar.gz
 	source = supplementary.tar.zst
-	sha512sums = d3d43785bfdc7fd9af1c47d1dc109c77c0abeb4f552f764a0ce6ebf8e127701fd0a32ce3cc2ed1cae350622883760bf94e93d815669155896de44a5825e6904d
-	sha512sums = 6a0edd52bbbe0bc724bcb92a3fe05b22393d4e7e40869c3eb978c6a997ac2ace2af76809fa7587513848c86ab29285665cdcd2e1ddb7a1de5fd0cf950e889383
+	sha512sums = 69e5ea189c042ee7296bbc2b364000f6b3afbf17e114c1726e03cb39530622e154585128a5341484c90de9edcd201ac4422652853bd3f528a8c4a9d94c2d7ccf
+	sha512sums = b159d14b04373fe0a643a07386e0c7fbc14471f68cdf37aacdc1deb115d332ff888f53b9881b8c01934a6820583cf0b173c4fdea614ebe3cc30267fe427fc6bf
 
 pkgname = proton-ge-custom-bin
diff --git a/PKGBUILD b/PKGBUILD
index e157eca0b1ae..185ad356c1dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 ## pkginfo
 pkgdesc="A fancy custom distribution of Valves Proton with various patches"
 pkgname=proton-ge-custom-bin
-pkgver=GE_Proton7_3
+pkgver=GE_Proton7_4
 pkgrel=1
 epoch=1
 arch=('x86_64')
@@ -17,15 +17,14 @@ conflicts=('proton-ge-custom-legacy-bin' 'proton-ge-custom')
 ## dependencies
 depends=('python'
          'vulkan-icd-loader'
-         'lib32-libusb'
          'lib32-openal'
-         'lib32-sdl2'
-         'lib32-v4l-utils'
-         'lib32-jack'
+         # libav support #
          'lib32-libva'
          'ffmpeg4.4'
          'lib32-speex'
          'lib32-libtheora'
+         'lib32-libvdpau'
+         # gstreamer support #
          'gst-plugins-bad-libs'
          'lib32-gst-plugins-base-libs'
          'libjpeg6-turbo'
@@ -41,7 +40,8 @@ optdepends=('kdialog: KDE splash dialog support'
             'vulkan-driver: driver to be used by dxvk'
             'winetricks: protonfixes backend - highly recommended'
             'wine: support for 32bit prefixes'
-            'xboxdrv: gamepad driver service')
+            'xboxdrv: gamepad driver service'
+            'lib32-libusb: wine usb support')
 
 ## makepkg options
 options=('!strip')
@@ -64,8 +64,8 @@ backup=("${_protoncfg}")
 url='https://github.com/GloriousEggroll/proton-ge-custom'
 source=(${_pkgver}_${pkgrel}.tar.gz::"${url}/releases/download/${_pkgver}/${_pkgver}.tar.gz"
         "supplementary.tar.zst")
-sha512sums=('d3d43785bfdc7fd9af1c47d1dc109c77c0abeb4f552f764a0ce6ebf8e127701fd0a32ce3cc2ed1cae350622883760bf94e93d815669155896de44a5825e6904d'
-            '6a0edd52bbbe0bc724bcb92a3fe05b22393d4e7e40869c3eb978c6a997ac2ace2af76809fa7587513848c86ab29285665cdcd2e1ddb7a1de5fd0cf950e889383')
+sha512sums=('69e5ea189c042ee7296bbc2b364000f6b3afbf17e114c1726e03cb39530622e154585128a5341484c90de9edcd201ac4422652853bd3f528a8c4a9d94c2d7ccf'
+            'b159d14b04373fe0a643a07386e0c7fbc14471f68cdf37aacdc1deb115d332ff888f53b9881b8c01934a6820583cf0b173c4fdea614ebe3cc30267fe427fc6bf')
 
 build() {
 ## patches
@@ -74,6 +74,7 @@ sed -i "s|_proton=echo|_proton=/${_protondir}/proton|" ${srcdir}/launchers/proto
 sed -i -r 's|"GE-Proton.*"|"Proton-GE"|' ${_srcdir}/compatibilitytool.vdf
 ## remove artifacts
 rm "${_srcdir}"/protonfixes/*.tar.xz
+rm -rf "${_srcdir}"/protonfixes/.git*
 ## fixes from namcap inspection
 strip --preserve-dates --strip-unneeded "${_srcdir}"/files/bin/wine*
 }
diff --git a/changelog.md b/changelog.md
index ef86b90b70c8..cd47a2cc5a9d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,16 @@
+## GE-Proton7-4 Released

+Another hotfix build:

+

+Added HideWineExports patch from wine-staging. Fixes games that need it, notably those using EAC disable workarounds such as:

+

+Jump Force

+Dragonball Fighter Z

+Naruto to Boruto: Shinobi Striker

+

+Added EAC disable workaround for single player in Naruto to Boruto: Shinobi Striker

+Added upstream ldap patch so that build does not fail when using newer ldap library (this is mostly needed for compiling outside of proton build environment)

+Fixed build environment submodule symlink issue

+

 ## GE-Proton7-3 Released

 

 Another hotfix build.

diff --git a/supplementary.tar.zst b/supplementary.tar.zst
index 6ef2ba366c75..3f96ae34192c 100644
--- a/supplementary.tar.zst
+++ b/supplementary.tar.zst