[lilac] updated to 5.0.9-6

3 files changed, 86 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c0670ab03f0..e8f8e4fc94f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = proton
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components
 	pkgver = 5.0.9
-	pkgrel = 3
+	pkgrel = 6
 	url = https://github.com/ValveSoftware/Proton/
 	arch = x86_64
 	license = BSD
@@ -9,8 +9,10 @@ pkgbase = proton
 	depends = wine-valve
 	source = https://github.com/ValveSoftware/Proton/archive/proton-5.0-9.tar.gz
 	source = wined3d-interop.h
+	source = wine-dynamic_load_wrapper.patch
 	md5sums = 8737560d53ab3d7bc49b0d463e47387a
 	md5sums = 1f6f0f5e4679418d4976e0cf9589a8d9
+	md5sums = 38464f9805e4423ba5f92f8864168f97
 
 pkgname = proton
 
diff --git a/PKGBUILD b/PKGBUILD
index 390c99288edd..9ac386c12579 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=proton
 _pkgver='5.0-9'
 # Arch - no hyphens
 pkgver=5.0.9
-pkgrel=3
+pkgrel=6
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
 arch=('x86_64')
 url="https://github.com/ValveSoftware/Proton/"
@@ -18,19 +18,22 @@ depends=(
 makedepends=(
 	'vulkan-headers'
 )
-source=("https://github.com/ValveSoftware/Proton/archive/$pkgname-$_pkgver.tar.gz" "wined3d-interop.h")
+source=("https://github.com/ValveSoftware/Proton/archive/$pkgname-$_pkgver.tar.gz"
+        "wined3d-interop.h"
+        "wine-dynamic_load_wrapper.patch")
 
 prepare() {
-	cd "Proton-$pkgname-$_pkgver"
-	cp $srcdir/wined3d-interop.h vrclient_x64/vrclient_x64/
+  cd "Proton-$pkgname-$_pkgver"
+  cp $srcdir/wined3d-interop.h vrclient_x64/vrclient_x64/
+  patch -p1 < $srcdir/wine-dynamic_load_wrapper.patch
 }
-
 build() {
 	cd "Proton-$pkgname-$_pkgver"
 
 	export CXXFLAGS="$CXXFLAGS -Wno-attributes"
-	export WINEMAKEFLAGS="--nosource-fix --nolower-include --nodlls --nomsvcrt --dll"
+	export WINEMAKEFLAGS="--nosource-fix --nolower-include --nodlls --nomsvcrt --dll -ldl"
 	export WINEMAKEFLAGS32="$WINEMAKEFLAGS --wine32"
+  export LDFLAGS="$LDFLAGS -L/usr/lib32/wine -lntdll.dll"
 
 	# The build script provided has so much cruft that it's easier to make everything manually
 	mkdir -p build/lsteamclient.win32
@@ -98,4 +101,5 @@ package() {
 }
 
 md5sums=('8737560d53ab3d7bc49b0d463e47387a'
-         '1f6f0f5e4679418d4976e0cf9589a8d9')
+         '1f6f0f5e4679418d4976e0cf9589a8d9'
+         '38464f9805e4423ba5f92f8864168f97')
diff --git a/wine-dynamic_load_wrapper.patch b/wine-dynamic_load_wrapper.patch
new file mode 100644
index 000000000000..b68f49ec0602
--- /dev/null
+++ b/wine-dynamic_load_wrapper.patch
@@ -0,0 +1,72 @@
+--- Proton-proton-5.0-9.orig/lsteamclient/steamclient_main.c	2020-06-11 00:04:52.000000000 +0200
++++ Proton-proton-5.0-9/lsteamclient/steamclient_main.c	2020-07-31 12:08:42.483353936 +0200
+@@ -475,37 +475,37 @@
+         path[PATH_MAX - 1] = 0;
+     }
+ #endif
+-    steamclient_lib = wine_dlopen(path, RTLD_NOW, NULL, 0);
++    steamclient_lib = dlopen(path, RTLD_NOW);
+     if(!steamclient_lib){
+         ERR("unable to load native steamclient library\n");
+         return 0;
+     }
+ 
+-    steamclient_CreateInterface = wine_dlsym(steamclient_lib, "CreateInterface", NULL, 0);
++    steamclient_CreateInterface = dlsym(steamclient_lib, "CreateInterface");
+     if(!steamclient_CreateInterface){
+         ERR("unable to load CreateInterface method\n");
+         return 0;
+     }
+ 
+-    steamclient_BGetCallback = wine_dlsym(steamclient_lib, "Steam_BGetCallback", NULL, 0);
++    steamclient_BGetCallback = dlsym(steamclient_lib, "Steam_BGetCallback");
+     if(!steamclient_BGetCallback){
+         ERR("unable to load BGetCallback method\n");
+         return 0;
+     }
+ 
+-    steamclient_GetAPICallResult = wine_dlsym(steamclient_lib, "Steam_GetAPICallResult", NULL, 0);
++    steamclient_GetAPICallResult = dlsym(steamclient_lib, "Steam_GetAPICallResult");
+     if(!steamclient_GetAPICallResult){
+         ERR("unable to load GetAPICallResult method\n");
+         return 0;
+     }
+ 
+-    steamclient_FreeLastCallback = wine_dlsym(steamclient_lib, "Steam_FreeLastCallback", NULL, 0);
++    steamclient_FreeLastCallback = dlsym(steamclient_lib, "Steam_FreeLastCallback");
+     if(!steamclient_FreeLastCallback){
+         ERR("unable to load FreeLastCallback method\n");
+         return 0;
+     }
+ 
+-    steamclient_ReleaseThreadLocalMemory = wine_dlsym(steamclient_lib, "Steam_ReleaseThreadLocalMemory", NULL, 0);
++    steamclient_ReleaseThreadLocalMemory = dlsym(steamclient_lib, "Steam_ReleaseThreadLocalMemory");
+     if(!steamclient_ReleaseThreadLocalMemory){
+         ERR("unable to load ReleaseThreadLocalMemory method\n");
+         return 0;
+diff -Naur Proton-proton-5.0-9.orig/vrclient_x64/vrclient_x64/vrclient_main.c Proton-proton-5.0-9/vrclient_x64/vrclient_x64/vrclient_main.c
+--- Proton-proton-5.0-9.orig/vrclient_x64/vrclient_x64/vrclient_main.c	2020-06-11 00:04:52.000000000 +0200
++++ Proton-proton-5.0-9/vrclient_x64/vrclient_x64/vrclient_main.c	2020-07-31 12:09:06.463354192 +0200
+@@ -258,19 +258,19 @@
+ 
+     TRACE("got openvr runtime path: %s\n", pathU);
+ 
+-    vrclient_lib = wine_dlopen(pathU, RTLD_NOW, NULL, 0);
++    vrclient_lib = dlopen(pathU, RTLD_NOW);
+     if(!vrclient_lib){
+         TRACE("unable to load vrclient.so\n");
+         return 0;
+     }
+ 
+-    vrclient_HmdSystemFactory = wine_dlsym(vrclient_lib, "HmdSystemFactory", NULL, 0);
++    vrclient_HmdSystemFactory = dlsym(vrclient_lib, "HmdSystemFactory");
+     if(!vrclient_HmdSystemFactory){
+         ERR("unable to load HmdSystemFactory method\n");
+         return 0;
+     }
+ 
+-    vrclient_VRClientCoreFactory = wine_dlsym(vrclient_lib, "VRClientCoreFactory", NULL, 0);
++    vrclient_VRClientCoreFactory = dlsym(vrclient_lib, "VRClientCoreFactory");
+     if(!vrclient_VRClientCoreFactory){
+         ERR("unable to load VRClientCoreFactory method\n");
+         return 0;