Attachment 225084 Details for Bug 255381 – 6.3-2 update + wow64 wrapper + misc workarounds

[patch] 6.3-2 update + wow64 wrapper + misc workarounds

wine-proton-6.3-3.patch (text/plain), 25.41 KB, created by Alex S on 2021-05-19 13:59:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex S

Created: 2021-05-19 13:59:26 UTC

Size: 25.41 KB

patch

obsolete

>From 7b2e480a4eac3a250714e0c076398f2df14dd1ba Mon Sep 17 00:00:00 2001
>From: Alex S <shkhln@users.noreply.github.com>
>Date: Sat, 24 Apr 2021 20:32:43 +0300
>Subject: [PATCH 1/2] emulators/wine-proton: update to 6.3.
>
>---
> emulators/wine-proton/Makefile                | 16 +++---
> emulators/wine-proton/distinfo                |  6 +--
> .../files/patch-dlls-ntdll-unix-registry.c    | 42 ----------------
> .../files/patch-dlls_ntdll_unix_loader.c      | 11 -----
> .../wine-proton/files/patch-tools_makedep.c   | 16 ------
> emulators/wine-proton/pkg-plist               | 49 +++++++++++++++++--
> 6 files changed, 55 insertions(+), 85 deletions(-)
> delete mode 100644 emulators/wine-proton/files/patch-dlls-ntdll-unix-registry.c
> delete mode 100644 emulators/wine-proton/files/patch-dlls_ntdll_unix_loader.c
> delete mode 100644 emulators/wine-proton/files/patch-tools_makedep.c
>
>diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile
>index 39911ddede2c..28ebe7521c75 100644
>--- a/emulators/wine-proton/Makefile
>+++ b/emulators/wine-proton/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	wine-proton
>-DISTVERSION=	5.13-4
>+DISTVERSION=	6.3-2
> CATEGORIES=	emulators
> 
> MAINTAINER=	iwtcex@gmail.com
>@@ -23,19 +23,22 @@ LIB_DEPENDS=	libFAudio.so:audio/faudio \
> 		libxml2.so:textproc/libxml2
> 
> USES=		bison desktop-file-utils gettext-runtime gl gmake gnome jpeg localbase openal pkgconfig sdl shebangfix tar:xz xorg
>+USE_GCC=	yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	ValveSoftware
> GH_PROJECT=	wine
>-GH_TAGNAME=	7f9f4285c2dfb81234c01996f6d33fae07701629
>+GH_TAGNAME=	97f962cd469ee9b9b68d32e79849bf94cfe15581
> 
>-USE_GCC=	yes
>-USE_GL=		glu
>+USE_GL=		gl
> USE_GNOME=	glib20
> USE_GSTREAMER1=	good
> USE_SDL=	sdl2
> USE_XORG=	x11 xext xcomposite xcursor xi xinerama xrandr xrender
> 
>+SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
>+		tools/winedump/function_grep.pl
>+
> GNU_CONFIGURE=		yes
> GNU_CONFIGURE_PREFIX=	${PREFIX}/${PORTNAME}
> 
>@@ -46,7 +49,6 @@ CONFIGURE_ARGS=	--verbose \
> 		--with-cms \
> 		--with-fontconfig \
> 		--with-freetype \
>-		--with-glu \
> 		--with-gnutls \
> 		--with-gstreamer \
> 		--with-jpeg \
>@@ -70,7 +72,6 @@ CONFIGURE_ARGS=	--verbose \
> 		--without-gettextpo \
> 		--without-gphoto \
> 		--without-gsm \
>-		--without-hal \
> 		--without-inotify \
> 		--without-krb5 \
> 		--without-ldap \
>@@ -90,9 +91,6 @@ CONFIGURE_ARGS=	--verbose \
> 
> CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" JXRLIB_CFLAGS="-I${LOCALBASE}/include/jxrlib"
> 
>-SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
>-		tools/winedump/function_grep.pl
>-
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == amd64
>diff --git a/emulators/wine-proton/distinfo b/emulators/wine-proton/distinfo
>index 2e8e068c149a..e854a71c6f0b 100644
>--- a/emulators/wine-proton/distinfo
>+++ b/emulators/wine-proton/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1609889470
>-SHA256 (ValveSoftware-wine-5.13-4-7f9f4285c2dfb81234c01996f6d33fae07701629_GH0.tar.gz) = f9b9f0784a91c5e5e96b9bf5c7e7fe0c4773e91b39a75422ecef07f682d621ba
>-SIZE (ValveSoftware-wine-5.13-4-7f9f4285c2dfb81234c01996f6d33fae07701629_GH0.tar.gz) = 40207346
>+TIMESTAMP = 1619288692
>+SHA256 (ValveSoftware-wine-6.3-2-97f962cd469ee9b9b68d32e79849bf94cfe15581_GH0.tar.gz) = 04832cd28ccfd91cf12d7a42c1c3eeba75a8cba87755032439a399396977a325
>+SIZE (ValveSoftware-wine-6.3-2-97f962cd469ee9b9b68d32e79849bf94cfe15581_GH0.tar.gz) = 40837161
>diff --git a/emulators/wine-proton/files/patch-dlls-ntdll-unix-registry.c b/emulators/wine-proton/files/patch-dlls-ntdll-unix-registry.c
>deleted file mode 100644
>index b7a0b9cb3975..000000000000
>--- a/emulators/wine-proton/files/patch-dlls-ntdll-unix-registry.c
>+++ /dev/null
>@@ -1,42 +0,0 @@
>-From: Gerald Pfeifer <gerald@pfeifer.com>
>-To: wine-devel@winehq.org
>-Date: Sat, 18 Jul 2020 12:02:58 +0300 (EEST)
>-Subject: [PATCH] ntdll: Include <signal.h> for sigset_t
>-
>-commit 7053b7c615b44e7112ab8fb4c056206d32b6f1c9
>-Author: Alexandre Julliard <julliard@winehq.org>
>-Date:   Fri Jul 17 11:46:15 2020 +0200
>-
>-    ntdll: Move the registry system calls to the Unix library.
>-    
>-    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
>-
>-broke non-Linux platforms since sigset_t isn't necessarily defined
>-based on the #include statements in the new dlls/ntdll/unix/registry.c.
>-
>-This fixes it.
>-
>-Observed and tested on FreeBSD 11.4/i386.
>-
>-Gerald
>-
>-Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
>----
>- dlls/ntdll/unix/registry.c | 1 +
>- 1 file changed, 1 insertion(+)
>-
>-diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c
>-index f94c8ff98e..6d58361818 100644
>---- dlls/ntdll/unix/registry.c
>-+++ dlls/ntdll/unix/registry.c
>-@@ -25,6 +25,7 @@
>- #pragma makedep unix
>- #endif
>- 
>-+#include <signal.h>
>- #include <stdarg.h>
>- #include <string.h>
>- 
>--- 
>-2.27.0
>-
>diff --git a/emulators/wine-proton/files/patch-dlls_ntdll_unix_loader.c b/emulators/wine-proton/files/patch-dlls_ntdll_unix_loader.c
>deleted file mode 100644
>index de5d168ff09d..000000000000
>--- a/emulators/wine-proton/files/patch-dlls_ntdll_unix_loader.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- dlls/ntdll/unix/loader.c.orig
>-+++ dlls/ntdll/unix/loader.c
>-@@ -1306,7 +1306,7 @@
>- 
>- #ifdef __FreeBSD__
>-         /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */
>--        if (!dlsym(RTLD_DEFAULT, "_rtld_version_laddr_offset"))
>-+        if (offsetof(struct link_map, l_addr) == 0)
>-             if (!get_relocbase(map->l_addr, &relocbase)) return;
>- #endif
>-         switch (dyn->d_tag)
>diff --git a/emulators/wine-proton/files/patch-tools_makedep.c b/emulators/wine-proton/files/patch-tools_makedep.c
>deleted file mode 100644
>index c8b3e0b26f2f..000000000000
>--- a/emulators/wine-proton/files/patch-tools_makedep.c
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-
>--L../libs/wine goes before -L/usr/local/lib.
>-
>---- tools/makedep.c.orig
>-+++ tools/makedep.c
>-@@ -3635,7 +3635,10 @@
>- 
>-         if (strarray_exists( &all_libs, "-lwine" ))
>-         {
>-+            struct strarray old_libs = all_libs;
>-+            all_libs = empty_strarray;
>-             strarray_add( &all_libs, strmake( "-L%s", top_obj_dir_path( make, "libs/wine" )));
>-+            strarray_addall(&all_libs, old_libs);
>-             if (ldrpath_local && ldrpath_install)
>-             {
>-                 program_installed = strmake( "%s-installed%s", make->programs.str[i], exe_ext );
>diff --git a/emulators/wine-proton/pkg-plist b/emulators/wine-proton/pkg-plist
>index 3f77b73de07b..bdd4d0d17b07 100644
>--- a/emulators/wine-proton/pkg-plist
>+++ b/emulators/wine-proton/pkg-plist
>@@ -2,6 +2,7 @@
> @comment %%WINE32%%wine-proton/lib/wine/steamclient.dll.so
> @comment %%WINE64%%wine-proton/lib/wine/fakedlls/steamclient64.dll
> @comment %%WINE64%%wine-proton/lib/wine/steamclient64.dll.so
>+@comment wine-proton/lib/libwine.so
> @comment wine-proton/lib/wine/fakedlls/winejoystick.drv
> @comment wine-proton/lib/wine/winejoystick.drv.so
> %%DOCSDIR%%/ANNOUNCE
>@@ -163,7 +164,6 @@ wine-proton/bin/winemine
> wine-proton/bin/winepath
> wine-proton/bin/wmc
> wine-proton/bin/wrc
>-wine-proton/lib/libwine.so
> wine-proton/lib/libwine.so.1
> wine-proton/lib/libwine.so.1.0
> wine-proton/lib/wine/acledit.dll.so
>@@ -206,6 +206,8 @@ wine-proton/lib/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so
> wine-proton/lib/wine/api-ms-win-core-errorhandling-l1-1-3.dll.so
> wine-proton/lib/wine/api-ms-win-core-fibers-l1-1-0.dll.so
> wine-proton/lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
>+wine-proton/lib/wine/api-ms-win-core-file-ansi-l2-1-0.dll.so
>+wine-proton/lib/wine/api-ms-win-core-file-fromapp-l1-1-0.dll.so
> wine-proton/lib/wine/api-ms-win-core-file-l1-1-0.dll.so
> wine-proton/lib/wine/api-ms-win-core-file-l1-2-0.dll.so
> wine-proton/lib/wine/api-ms-win-core-file-l1-2-1.dll.so
>@@ -247,6 +249,7 @@ wine-proton/lib/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
> wine-proton/lib/wine/api-ms-win-core-memory-l1-1-0.dll.so
> wine-proton/lib/wine/api-ms-win-core-memory-l1-1-1.dll.so
> wine-proton/lib/wine/api-ms-win-core-memory-l1-1-2.dll.so
>+wine-proton/lib/wine/api-ms-win-core-memory-l1-1-3.dll.so
> wine-proton/lib/wine/api-ms-win-core-memory-l1-1-4.dll.so
> wine-proton/lib/wine/api-ms-win-core-misc-l1-1-0.dll.so
> wine-proton/lib/wine/api-ms-win-core-namedpipe-ansi-l1-1-0.dll.so
>@@ -418,6 +421,7 @@ wine-proton/lib/wine/avicap32.dll.so
> wine-proton/lib/wine/avifil32.dll.so
> wine-proton/lib/wine/avrt.dll.so
> wine-proton/lib/wine/bcrypt.dll.so
>+wine-proton/lib/wine/bcrypt.so
> wine-proton/lib/wine/bluetoothapis.dll.so
> wine-proton/lib/wine/browseui.dll.so
> wine-proton/lib/wine/bthprops.cpl.so
>@@ -444,11 +448,14 @@ wine-proton/lib/wine/connect.dll.so
> wine-proton/lib/wine/control.exe.so
> wine-proton/lib/wine/credui.dll.so
> wine-proton/lib/wine/crtdll.dll.so
>+wine-proton/lib/wine/crtdll.so
> wine-proton/lib/wine/crypt32.dll.so
>+wine-proton/lib/wine/crypt32.so
> wine-proton/lib/wine/cryptdlg.dll.so
> wine-proton/lib/wine/cryptdll.dll.so
> wine-proton/lib/wine/cryptext.dll.so
> wine-proton/lib/wine/cryptnet.dll.so
>+wine-proton/lib/wine/cryptsp.dll.so
> wine-proton/lib/wine/cryptui.dll.so
> wine-proton/lib/wine/cscript.exe.so
> wine-proton/lib/wine/ctapi32.dll.so
>@@ -459,6 +466,7 @@ wine-proton/lib/wine/d3d10.dll.so
> wine-proton/lib/wine/d3d10core.dll.so
> wine-proton/lib/wine/d3d11.dll.so
> wine-proton/lib/wine/d3d8.dll.so
>+wine-proton/lib/wine/d3d8thk.dll.so
> wine-proton/lib/wine/d3d9.dll.so
> wine-proton/lib/wine/d3dcompiler_33.dll.so
> wine-proton/lib/wine/d3dcompiler_34.dll.so
>@@ -474,6 +482,7 @@ wine-proton/lib/wine/d3dcompiler_43.dll.so
> wine-proton/lib/wine/d3dcompiler_46.dll.so
> wine-proton/lib/wine/d3dcompiler_47.dll.so
> wine-proton/lib/wine/d3dim.dll.so
>+wine-proton/lib/wine/d3dim700.dll.so
> wine-proton/lib/wine/d3drm.dll.so
> wine-proton/lib/wine/d3dx10_33.dll.so
> wine-proton/lib/wine/d3dx10_34.dll.so
>@@ -513,6 +522,7 @@ wine-proton/lib/wine/davclnt.dll.so
> wine-proton/lib/wine/dbgeng.dll.so
> wine-proton/lib/wine/dbghelp.dll.so
> wine-proton/lib/wine/dciman32.dll.so
>+wine-proton/lib/wine/dcomp.dll.so
> wine-proton/lib/wine/ddraw.dll.so
> wine-proton/lib/wine/ddrawex.dll.so
> wine-proton/lib/wine/devenum.dll.so
>@@ -536,6 +546,7 @@ wine-proton/lib/wine/dmusic32.dll.so
> wine-proton/lib/wine/dnsapi.dll.so
> wine-proton/lib/wine/dotnetfx35.exe.so
> wine-proton/lib/wine/dplay.dll.so
>+wine-proton/lib/wine/dplaysvr.exe.so
> wine-proton/lib/wine/dplayx.dll.so
> wine-proton/lib/wine/dpnaddr.dll.so
> wine-proton/lib/wine/dpnet.dll.so
>@@ -543,6 +554,7 @@ wine-proton/lib/wine/dpnhpast.dll.so
> wine-proton/lib/wine/dpnlobby.dll.so
> wine-proton/lib/wine/dpnsvr.exe.so
> wine-proton/lib/wine/dpvoice.dll.so
>+wine-proton/lib/wine/dpvsetup.exe.so
> wine-proton/lib/wine/dpwsockx.dll.so
> wine-proton/lib/wine/drmclien.dll.so
> wine-proton/lib/wine/dsdmo.dll.so
>@@ -657,6 +669,8 @@ wine-proton/lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-3.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
>+wine-proton/lib/wine/fakedlls/api-ms-win-core-file-ansi-l2-1-0.dll
>+wine-proton/lib/wine/fakedlls/api-ms-win-core-file-fromapp-l1-1-0.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-file-l1-1-0.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-file-l1-2-1.dll
>@@ -698,6 +712,7 @@ wine-proton/lib/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-memory-l1-1-0.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-memory-l1-1-2.dll
>+wine-proton/lib/wine/fakedlls/api-ms-win-core-memory-l1-1-3.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-memory-l1-1-4.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-misc-l1-1-0.dll
> wine-proton/lib/wine/fakedlls/api-ms-win-core-namedpipe-ansi-l1-1-0.dll
>@@ -900,6 +915,7 @@ wine-proton/lib/wine/fakedlls/cryptdlg.dll
> wine-proton/lib/wine/fakedlls/cryptdll.dll
> wine-proton/lib/wine/fakedlls/cryptext.dll
> wine-proton/lib/wine/fakedlls/cryptnet.dll
>+wine-proton/lib/wine/fakedlls/cryptsp.dll
> wine-proton/lib/wine/fakedlls/cryptui.dll
> wine-proton/lib/wine/fakedlls/cscript.exe
> wine-proton/lib/wine/fakedlls/ctapi32.dll
>@@ -910,6 +926,7 @@ wine-proton/lib/wine/fakedlls/d3d10.dll
> wine-proton/lib/wine/fakedlls/d3d10core.dll
> wine-proton/lib/wine/fakedlls/d3d11.dll
> wine-proton/lib/wine/fakedlls/d3d8.dll
>+wine-proton/lib/wine/fakedlls/d3d8thk.dll
> wine-proton/lib/wine/fakedlls/d3d9.dll
> wine-proton/lib/wine/fakedlls/d3dcompiler_33.dll
> wine-proton/lib/wine/fakedlls/d3dcompiler_34.dll
>@@ -925,6 +942,7 @@ wine-proton/lib/wine/fakedlls/d3dcompiler_43.dll
> wine-proton/lib/wine/fakedlls/d3dcompiler_46.dll
> wine-proton/lib/wine/fakedlls/d3dcompiler_47.dll
> wine-proton/lib/wine/fakedlls/d3dim.dll
>+wine-proton/lib/wine/fakedlls/d3dim700.dll
> wine-proton/lib/wine/fakedlls/d3drm.dll
> wine-proton/lib/wine/fakedlls/d3dx10_33.dll
> wine-proton/lib/wine/fakedlls/d3dx10_34.dll
>@@ -964,6 +982,7 @@ wine-proton/lib/wine/fakedlls/davclnt.dll
> wine-proton/lib/wine/fakedlls/dbgeng.dll
> wine-proton/lib/wine/fakedlls/dbghelp.dll
> wine-proton/lib/wine/fakedlls/dciman32.dll
>+wine-proton/lib/wine/fakedlls/dcomp.dll
> wine-proton/lib/wine/fakedlls/ddraw.dll
> wine-proton/lib/wine/fakedlls/ddrawex.dll
> wine-proton/lib/wine/fakedlls/devenum.dll
>@@ -987,6 +1006,7 @@ wine-proton/lib/wine/fakedlls/dmusic32.dll
> wine-proton/lib/wine/fakedlls/dnsapi.dll
> wine-proton/lib/wine/fakedlls/dotnetfx35.exe
> wine-proton/lib/wine/fakedlls/dplay.dll
>+wine-proton/lib/wine/fakedlls/dplaysvr.exe
> wine-proton/lib/wine/fakedlls/dplayx.dll
> wine-proton/lib/wine/fakedlls/dpnaddr.dll
> wine-proton/lib/wine/fakedlls/dpnet.dll
>@@ -994,6 +1014,7 @@ wine-proton/lib/wine/fakedlls/dpnhpast.dll
> wine-proton/lib/wine/fakedlls/dpnlobby.dll
> wine-proton/lib/wine/fakedlls/dpnsvr.exe
> wine-proton/lib/wine/fakedlls/dpvoice.dll
>+wine-proton/lib/wine/fakedlls/dpvsetup.exe
> wine-proton/lib/wine/fakedlls/dpwsockx.dll
> wine-proton/lib/wine/fakedlls/drmclien.dll
> wine-proton/lib/wine/fakedlls/dsdmo.dll
>@@ -1416,6 +1437,7 @@ wine-proton/lib/wine/fakedlls/wdscore.dll
> wine-proton/lib/wine/fakedlls/webservices.dll
> wine-proton/lib/wine/fakedlls/wer.dll
> wine-proton/lib/wine/fakedlls/wevtapi.dll
>+wine-proton/lib/wine/fakedlls/wevtsvc.dll
> wine-proton/lib/wine/fakedlls/wevtutil.exe
> wine-proton/lib/wine/fakedlls/where.exe
> wine-proton/lib/wine/fakedlls/whoami.exe
>@@ -1542,6 +1564,7 @@ wine-proton/lib/wine/fusion.dll.so
> wine-proton/lib/wine/fwpuclnt.dll.so
> wine-proton/lib/wine/gameux.dll.so
> wine-proton/lib/wine/gdi32.dll.so
>+wine-proton/lib/wine/gdi32.so
> wine-proton/lib/wine/gdiplus.dll.so
> wine-proton/lib/wine/glu32.dll.so
> wine-proton/lib/wine/gphoto2.ds.so
>@@ -1769,6 +1792,7 @@ wine-proton/lib/wine/libvulkan-1.def
> wine-proton/lib/wine/libwbemuuid.a
> wine-proton/lib/wine/libwebservices.def
> wine-proton/lib/wine/libwer.def
>+wine-proton/lib/wine/libwevtapi.def
> wine-proton/lib/wine/libwindowscodecs.a
> wine-proton/lib/wine/libwindowscodecsext.def
> wine-proton/lib/wine/libwinecrt0.a
>@@ -1829,6 +1853,7 @@ wine-proton/lib/wine/msadp32.acm.so
> wine-proton/lib/wine/msasn1.dll.so
> wine-proton/lib/wine/mscat32.dll.so
> wine-proton/lib/wine/mscms.dll.so
>+wine-proton/lib/wine/mscms.so
> wine-proton/lib/wine/mscoree.dll.so
> wine-proton/lib/wine/mscorwks.dll.so
> wine-proton/lib/wine/msctf.dll.so
>@@ -1877,17 +1902,26 @@ wine-proton/lib/wine/msvcp71.dll.so
> wine-proton/lib/wine/msvcp80.dll.so
> wine-proton/lib/wine/msvcp90.dll.so
> wine-proton/lib/wine/msvcr100.dll.so
>+wine-proton/lib/wine/msvcr100.so
> wine-proton/lib/wine/msvcr110.dll.so
>+wine-proton/lib/wine/msvcr110.so
> wine-proton/lib/wine/msvcr120_app.dll.so
> wine-proton/lib/wine/msvcr120.dll.so
>+wine-proton/lib/wine/msvcr120.so
> wine-proton/lib/wine/msvcr70.dll.so
>+wine-proton/lib/wine/msvcr70.so
> wine-proton/lib/wine/msvcr71.dll.so
>+wine-proton/lib/wine/msvcr71.so
> wine-proton/lib/wine/msvcr80.dll.so
>+wine-proton/lib/wine/msvcr80.so
> wine-proton/lib/wine/msvcr90.dll.so
>+wine-proton/lib/wine/msvcr90.so
> wine-proton/lib/wine/msvcrt.dll.so
>+wine-proton/lib/wine/msvcrt.so
> wine-proton/lib/wine/msvcrt20.dll.so
> wine-proton/lib/wine/msvcrt40.dll.so
> wine-proton/lib/wine/msvcrtd.dll.so
>+wine-proton/lib/wine/msvcrtd.so
> wine-proton/lib/wine/msvfw32.dll.so
> wine-proton/lib/wine/msvidc32.dll.so
> wine-proton/lib/wine/mswsock.dll.so
>@@ -1922,6 +1956,7 @@ wine-proton/lib/wine/ntoskrnl.exe.so
> wine-proton/lib/wine/ntprint.dll.so
> wine-proton/lib/wine/objsel.dll.so
> wine-proton/lib/wine/odbc32.dll.so
>+wine-proton/lib/wine/odbc32.so
> wine-proton/lib/wine/odbcbcp.dll.so
> wine-proton/lib/wine/odbccp32.dll.so
> wine-proton/lib/wine/odbccu32.dll.so
>@@ -1956,6 +1991,7 @@ wine-proton/lib/wine/pstorec.dll.so
> wine-proton/lib/wine/pwrshplugin.dll.so
> wine-proton/lib/wine/qasf.dll.so
> wine-proton/lib/wine/qcap.dll.so
>+wine-proton/lib/wine/qcap.so
> wine-proton/lib/wine/qdvd.dll.so
> wine-proton/lib/wine/qedit.dll.so
> wine-proton/lib/wine/qmgr.dll.so
>@@ -2047,6 +2083,7 @@ wine-proton/lib/wine/traffic.dll.so
> wine-proton/lib/wine/twain_32.dll.so
> wine-proton/lib/wine/tzres.dll.so
> wine-proton/lib/wine/ucrtbase.dll.so
>+wine-proton/lib/wine/ucrtbase.so
> wine-proton/lib/wine/uianimation.dll.so
> wine-proton/lib/wine/uiautomationcore.dll.so
> wine-proton/lib/wine/uiribbon.dll.so
>@@ -2058,6 +2095,7 @@ wine-proton/lib/wine/url.dll.so
> wine-proton/lib/wine/urlmon.dll.so
> wine-proton/lib/wine/usbd.sys.so
> wine-proton/lib/wine/user32.dll.so
>+wine-proton/lib/wine/user32.so
> wine-proton/lib/wine/userenv.dll.so
> wine-proton/lib/wine/usp10.dll.so
> wine-proton/lib/wine/utildll.dll.so
>@@ -2084,6 +2122,7 @@ wine-proton/lib/wine/wdscore.dll.so
> wine-proton/lib/wine/webservices.dll.so
> wine-proton/lib/wine/wer.dll.so
> wine-proton/lib/wine/wevtapi.dll.so
>+wine-proton/lib/wine/wevtsvc.dll.so
> wine-proton/lib/wine/wevtutil.exe.so
> wine-proton/lib/wine/where.exe.so
> wine-proton/lib/wine/whoami.exe.so
>@@ -2094,6 +2133,7 @@ wine-proton/lib/wine/windows.globalization.dll.so
> wine-proton/lib/wine/windows.media.devices.dll.so
> wine-proton/lib/wine/windows.media.speech.dll.so
> wine-proton/lib/wine/windowscodecs.dll.so
>+wine-proton/lib/wine/windowscodecs.so
> wine-proton/lib/wine/windowscodecsext.dll.so
> wine-proton/lib/wine/wineboot.exe.so
> wine-proton/lib/wine/winebrowser.exe.so
>@@ -2105,6 +2145,7 @@ wine-proton/lib/wine/winedbg.exe.so
> wine-proton/lib/wine/winedevice.exe.so
> wine-proton/lib/wine/winefile.exe.so
> wine-proton/lib/wine/winegstreamer.dll.so
>+wine-proton/lib/wine/winegstreamer.so
> wine-proton/lib/wine/winehid.sys.so
> wine-proton/lib/wine/winemapi.dll.so
> wine-proton/lib/wine/winemine.exe.so
>@@ -2137,6 +2178,7 @@ wine-proton/lib/wine/wmic.exe.so
> wine-proton/lib/wine/wmiutils.dll.so
> wine-proton/lib/wine/wmp.dll.so
> wine-proton/lib/wine/wmphoto.dll.so
>+wine-proton/lib/wine/wmphoto.so
> wine-proton/lib/wine/wmplayer.exe.so
> wine-proton/lib/wine/wmvcore.dll.so
> wine-proton/lib/wine/wnaspi32.dll.so
>@@ -2251,6 +2293,7 @@ wine-proton/share/wine/fonts/vgasyse.fon
> wine-proton/share/wine/fonts/vgasysg.fon
> wine-proton/share/wine/fonts/vgasysr.fon
> wine-proton/share/wine/fonts/vgasyst.fon
>+wine-proton/share/wine/fonts/webdings.ttf
> wine-proton/share/wine/fonts/wingding.ttf
> wine-proton/share/wine/nls/c_037.nls
> wine-proton/share/wine/nls/c_10000.nls
>@@ -2297,6 +2340,7 @@ wine-proton/share/wine/nls/c_28603.nls
> wine-proton/share/wine/nls/c_28605.nls
> wine-proton/share/wine/nls/c_437.nls
> wine-proton/share/wine/nls/c_500.nls
>+wine-proton/share/wine/nls/c_708.nls
> wine-proton/share/wine/nls/c_737.nls
> wine-proton/share/wine/nls/c_775.nls
> wine-proton/share/wine/nls/c_850.nls
>@@ -2325,6 +2369,3 @@ wine-proton/share/wine/nls/normnfkc.nls
> wine-proton/share/wine/nls/normnfkd.nls
> wine-proton/share/wine/nls/sortdefault.nls
> wine-proton/share/wine/wine.inf
>-wine-proton/share/wine/winebus.inf
>-wine-proton/share/wine/winehid.inf
>-wine-proton/share/wine/wineusb.inf
>-- 
>2.31.1
>
>
>From 1ee102bc02753fbe16c5ee857abab86c98dfee27 Mon Sep 17 00:00:00 2001
>From: Alex S <shkhln@users.noreply.github.com>
>Date: Sat, 24 Apr 2021 21:22:58 +0300
>Subject: [PATCH 2/2] emulators/wine-proton: add wow64 wrapper.
>
>---
> emulators/wine-proton/Makefile            |  7 ++++-
> emulators/wine-proton/files/pkg32.sh      | 13 +++++++++
> emulators/wine-proton/files/wine-wow64.sh | 34 +++++++++++++++++++++++
> emulators/wine-proton/files/wine.sh       | 23 +++++++++++++--
> emulators/wine-proton/pkg-plist           |  6 ++--
> 5 files changed, 77 insertions(+), 6 deletions(-)
> create mode 100644 emulators/wine-proton/files/pkg32.sh
> create mode 100644 emulators/wine-proton/files/wine-wow64.sh
>
>diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile
>index 28ebe7521c75..50497ccb5a97 100644
>--- a/emulators/wine-proton/Makefile
>+++ b/emulators/wine-proton/Makefile
>@@ -106,8 +106,13 @@ pre-build:
> post-install:
> .if ${ARCH} == i386
> 	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wineserver ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wineserver32
>-	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine       ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine32
>+	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine       ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine.bin
> 	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine
>+.else
>+	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh                ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/pkg32.sh
>+	${MV} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64     ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64.bin
>+	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh                 ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine64
>+	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh           ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/wine
> .endif
> 	${RM} -r ${STAGEDIR}${PREFIX}/${PORTNAME}/include
> 	${RM} -r ${STAGEDIR}${MANPREFIX}/man
>diff --git a/emulators/wine-proton/files/pkg32.sh b/emulators/wine-proton/files/pkg32.sh
>new file mode 100644
>index 000000000000..7aebca5b7cd1
>--- /dev/null
>+++ b/emulators/wine-proton/files/pkg32.sh
>@@ -0,0 +1,13 @@
>+#!/bin/sh -e
>+if [ "$(id -u)" = 0 ]
>+then
>+  echo "Don't run this script as root!"
>+  exit 1
>+fi
>+
>+I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
>+
>+mkdir -p "$I386_ROOT"
>+ABI=$(pkg config ABI | sed s/amd64/i386/)
>+echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
>+exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
>diff --git a/emulators/wine-proton/files/wine-wow64.sh b/emulators/wine-proton/files/wine-wow64.sh
>new file mode 100644
>index 000000000000..db8ac4649945
>--- /dev/null
>+++ b/emulators/wine-proton/files/wine-wow64.sh
>@@ -0,0 +1,34 @@
>+#!/bin/sh -e
>+TARGET="$(realpath "$0")"
>+PREFIX="${TARGET%/*/*}"
>+LOCALBASE="${PREFIX%/*}"
>+
>+I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
>+
>+export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
>+export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib:$I386_ROOT/$LOCALBASE/llvm10/lib:$I386_ROOT/$LOCALBASE/llvm11/lib"
>+export LD_32_LIBRARY_PATH_RPATH=y
>+
>+if [ -z "$WINE_NO_WOW64" ]
>+then
>+  export PATH="${TARGET%/*}:${PATH}"
>+  export WINESERVER="${TARGET}server"
>+fi
>+
>+if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ]
>+then
>+  printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine"
>+  printf "Try installing 32-bit wine with\n\t%s\n" "$PREFIX/bin/pkg32.sh install wine-proton mesa-dri"
>+  exit 1
>+fi
>+
>+WINE32_VERSION=$(env -u WINELOADERNOEXEC "$I386_ROOT/$PREFIX/bin/wine" --version)
>+WINE64_VERSION=$(env -u WINELOADERNOEXEC "${TARGET}64" --version)
>+if [ "$WINE32_VERSION" != "$WINE64_VERSION" ]
>+then
>+  printf "wine [%s] and wine64 [%s] versions do not match!\n\n" "$WINE32_VERSION" "$WINE64_VERSION"
>+  printf "Try updating 32-bit wine with\n\t%s\n" "$PREFIX/bin/pkg32.sh upgrade"
>+  exit 1
>+fi
>+
>+exec "$I386_ROOT/$PREFIX/bin/wine" "$@"
>diff --git a/emulators/wine-proton/files/wine.sh b/emulators/wine-proton/files/wine.sh
>index 7dfe3e66c4ca..63d5ba68a1ab 100644
>--- a/emulators/wine-proton/files/wine.sh
>+++ b/emulators/wine-proton/files/wine.sh
>@@ -1,4 +1,21 @@
> #!/bin/sh
>-TARGET="`realpath $0`"
>-export WINESERVER=${WINESERVER-${TARGET}server32}
>-exec "${TARGET}32" "$@"
>+TARGET="$(realpath "$0")"
>+
>+if [ -z "$WINESERVER" ] && [ -f "${TARGET}server32" ]
>+then
>+  export WINESERVER="${TARGET}server32"
>+fi
>+
>+export GST_PLUGIN_SYSTEM_PATH_1_0="${TARGET%/*/*/*}/lib/gstreamer-1.0"
>+
>+# workaround for https://bugs.winehq.org/show_bug.cgi?id=50257
>+export LD_BIND_NOW=1
>+export LD_32_BIND_NOW=1
>+
>+# workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255336
>+if [ "$(uname -p)" = amd64 ]
>+then
>+  export LD_LIBMAP="libgcc_s.so.1=/lib/libgcc_s.so.1,${LD_LIBMAP}"
>+fi
>+
>+exec "${TARGET}.bin" "$@"
>diff --git a/emulators/wine-proton/pkg-plist b/emulators/wine-proton/pkg-plist
>index bdd4d0d17b07..6020329c2d1f 100644
>--- a/emulators/wine-proton/pkg-plist
>+++ b/emulators/wine-proton/pkg-plist
>@@ -8,8 +8,7 @@
> %%DOCSDIR%%/ANNOUNCE
> %%DOCSDIR%%/AUTHORS
> %%DOCSDIR%%/README
>-%%WINE32%%wine-proton/bin/wine
>-%%WINE32%%wine-proton/bin/wine32
>+%%WINE32%%wine-proton/bin/wine.bin
> %%WINE32%%wine-proton/bin/wineserver32
> %%WINE32%%wine-proton/lib/wine/avifile.dll16.so
> %%WINE32%%wine-proton/lib/wine/comm.drv16.so
>@@ -140,7 +139,9 @@
> %%WINE32%%wine-proton/lib/wine/winsock.dll16.so
> %%WINE32%%wine-proton/lib/wine/wintab.dll16.so
> %%WINE32%%wine-proton/lib/wine/wow32.dll.so
>+%%WINE64%%wine-proton/bin/pkg32.sh
> %%WINE64%%wine-proton/bin/wine64
>+%%WINE64%%wine-proton/bin/wine64.bin
> %%WINE64%%wine-proton/bin/wineserver
> wine-proton/bin/function_grep.pl
> wine-proton/bin/msidb
>@@ -149,6 +150,7 @@ wine-proton/bin/notepad
> wine-proton/bin/regedit
> wine-proton/bin/regsvr32
> wine-proton/bin/widl
>+wine-proton/bin/wine
> wine-proton/bin/wineboot
> wine-proton/bin/winebuild
> wine-proton/bin/winecfg
>-- 
>2.31.1
>

Flags:

iwtcex: maintainer-approval+

Actions: View | Diff

Attachments on bug 255381: 224410 | 225084