Bug 255381 - emulators/wine-proton: update to 6.3-2, add a wow64 wrapper script
Summary: emulators/wine-proton: update to 6.3-2, add a wow64 wrapper script
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Li-Wen Hsu
URL:
Keywords: patch-ready
Depends on: 255380
Blocks:
  Show dependency treegraph
 
Reported: 2021-04-25 01:03 UTC by Alex S
Modified: 2021-05-23 04:39 UTC (History)
2 users (show)

See Also:


Attachments
6.3-2 update + wow64 wrapper + misc workarounds (25.35 KB, patch)
2021-04-25 01:03 UTC, Alex S
iwtcex: maintainer-approval+
Details | Diff
6.3-2 update + wow64 wrapper + misc workarounds (25.41 KB, patch)
2021-05-19 13:59 UTC, Alex S
iwtcex: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex S 2021-04-25 01:03:50 UTC
Created attachment 224410 [details]
6.3-2 update + wow64 wrapper + misc workarounds

Note that there is no changelog in the upstream repo and since all versions are maintained in separate branches they are not easily comparable. As for the wrapper, games/linux-steam-utils already uses a similar script, but this port is a more suitable place for it in my opinion.
Comment 1 Fernando Apesteguía freebsd_committer 2021-04-26 13:05:40 UTC
Q/A:  /tmp/255381/emulators/wine-proton/pkg-plist: [169]: installing shared libraries, please define USE_LDCONFIG as appropriate

 /tmp/255381/emulators/wine-proton/files/patch-dlls_ntdll_unix_fsync.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
 /tmp/255381/emulators/wine-proton/files/patch-dlls_ntdll_unix_signal_x86_64.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
 /tmp/255381/emulators/wine-proton/files/patch-dlls_winebus.sys_bus_sdl.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
 /tmp/255381/emulators/wine-proton/files/patch-server_fsync.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
 /tmp/255381/emulators/wine-proton/files/patch-server_ptrace.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.

Would you have a look at these?

Thanks!
Comment 2 Alex S 2021-04-26 18:27:11 UTC
(In reply to Fernando Apesteguía from comment #1)

> installing shared libraries, please define USE_LDCONFIG as appropriate

This port (wine-proton) specifically installs libraries to /usr/local/wine-proton/lib to allow simultaneous installation with wine or wine-devel ports, USE_LDCONFIG contradicts this purpose.

> /tmp/255381/emulators/wine-proton/files/patch-dlls_ntdll_unix_fsync.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.

Well, I tend to edit patches by hand, so I removed the date bits (before I knew that portlint cares about them), otherwise those are typical unified diffs. And, no, I find `make makepatch` too confusing to use for anything other than initial patchset generation.
Comment 3 Alex S 2021-05-19 13:59:26 UTC
Created attachment 225084 [details]
6.3-2 update + wow64 wrapper + misc workarounds

+ llvm lib path
Comment 4 commit-hook freebsd_committer 2021-05-23 04:38:26 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d8fafe84bd58baef7d4e2696cc16bcf67db4cf3d

commit d8fafe84bd58baef7d4e2696cc16bcf67db4cf3d
Author:     Alex S <shkhln@users.noreply.github.com>
AuthorDate: 2021-04-24 18:22:58 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-05-23 04:37:44 +0000

    emulators/wine-proton: add wow64 wrapper.

    PR:             255381

 emulators/wine-proton/Makefile                  |  7 ++++-
 emulators/wine-proton/files/pkg32.sh (new)      | 13 ++++++++++
 emulators/wine-proton/files/wine-wow64.sh (new) | 34 +++++++++++++++++++++++++
 emulators/wine-proton/files/wine.sh             | 23 ++++++++++++++---
 emulators/wine-proton/pkg-plist                 |  6 +++--
 5 files changed, 77 insertions(+), 6 deletions(-)
Comment 5 commit-hook freebsd_committer 2021-05-23 04:38:27 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1c2c1dec445e2cdba59c41cd293cb2b5b50b7b91

commit 1c2c1dec445e2cdba59c41cd293cb2b5b50b7b91
Author:     Alex S <shkhln@users.noreply.github.com>
AuthorDate: 2021-04-24 17:32:43 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-05-23 04:37:42 +0000

    emulators/wine-proton: update to 6.3.

    PR:             255381

 emulators/wine-proton/Makefile                     | 16 ++++---
 emulators/wine-proton/distinfo                     |  6 +--
 .../files/patch-dlls-ntdll-unix-registry.c (gone)  | 42 -------------------
 .../files/patch-dlls_ntdll_unix_loader.c (gone)    | 11 -----
 .../wine-proton/files/patch-tools_makedep.c (gone) | 16 -------
 emulators/wine-proton/pkg-plist                    | 49 ++++++++++++++++++++--
 6 files changed, 55 insertions(+), 85 deletions(-)