Bug 282825 - emulators/wine-devel: Enable Wayland support
Summary: emulators/wine-devel: Enable Wayland support
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-11-18 04:58 UTC by tatarataratatan
Modified: 2025-04-11 21:31 UTC (History)
5 users (show)

See Also:


Attachments
wayland support wine-devel port diff from wine-devel-9.21,1 (3.27 KB, text/plain)
2024-11-18 04:58 UTC, tatarataratatan
no flags Details
git diff(wayland support) (3.28 KB, patch)
2024-11-18 05:23 UTC, tatarataratatan
no flags Details | Diff
patch git format-patch (3.94 KB, patch)
2025-01-06 21:35 UTC, Thibault Payet
no flags Details | Diff
patch git format-patch (4.11 KB, patch)
2025-01-06 21:41 UTC, Thibault Payet
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tatarataratatan 2024-11-18 04:58:45 UTC
Created attachment 255249 [details]
wayland support wine-devel port diff from wine-devel-9.21,1

I've attached a patch which supports Wayland in wine-devel-9.21,1 .
I've tested it and it looks good to me.
Comment 1 tatarataratatan 2024-11-18 05:23:01 UTC
Created attachment 255250 [details]
git diff(wayland support)

I've made git diff version manually :) .
Comment 2 Thibault Payet 2025-01-05 17:24:20 UTC
(In reply to tatarataratatan from comment #1)
Do not use PORTEPOCH to update the port version, you need to use PORTREVISION for that.
Comment 3 Gerald Pfeifer freebsd_committer freebsd_triage 2025-01-06 08:40:07 UTC
Dima, this may be one for you which I believe could go in(to wine-devel)
before the Wine 10.0 release even if you like.
Comment 4 Thibault Payet 2025-01-06 21:35:03 UTC
Created attachment 256483 [details]
patch git format-patch

Here is the version with PORTREVISION updated instead of PORTEPOCH.
Please make sure to credit tatarataratatan and not me since I just changed one line.
Comment 5 Thibault Payet 2025-01-06 21:41:01 UTC
Created attachment 256484 [details]
patch git format-patch

It helps if I remove my previous patches before, sorry for the noise.
Comment 6 Gerald Pfeifer freebsd_committer freebsd_triage 2025-01-12 12:03:11 UTC
(In reply to Thibault Payet from comment #4)
> Please make sure to credit tatarataratatan and not me since I just
> changed one line.

This is a fine note, Thibault. I added you under Reviewed by:, since
this is what you actually did, and indeed spotting an issue.

I made some tweaks to files/pkg-message.in and removed the new WAYLAND
option from OPTIONS_DEFAULT and will commit shortly (adding the missing
colon after the port's name to the subject).
Comment 7 commit-hook freebsd_committer freebsd_triage 2025-01-12 12:05:03 UTC
A commit in branch main references this bug:

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

commit 2acb6e55988b6fc62015ce70132c885dc2d620a2
Author:     tatarataratatan@gmail.com <tatarataratatan@gmail.com>
AuthorDate: 2025-01-12 11:54:40 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2025-01-12 12:03:48 +0000

    emulators/wine-devel: Enable Wayland support

    This is not on by default (yet).

    PR:             282825
    Reviewed by:    Thibault Payet <monwarez@mailoo.org>

 emulators/wine-devel/Makefile             | 19 ++++++++++++++++---
 emulators/wine-devel/files/pkg-message.in |  8 ++++++++
 emulators/wine-devel/pkg-plist            |  2 ++
 3 files changed, 26 insertions(+), 3 deletions(-)
Comment 8 Gerald Pfeifer freebsd_committer freebsd_triage 2025-01-12 12:22:24 UTC
Note, I'm planning to push this to the main emulators/wine port a bit
after an upgrade to Wine 10.0 that should happen this month or next to
let this settle a bit on wine-devel and give (more experienced) users
a chance to play.
Comment 9 Jan Beich freebsd_committer freebsd_triage 2025-01-12 13:31:29 UTC
(In reply to Gerald Pfeifer from comment #6)
> removed the new WAYLAND option from OPTIONS_DEFAULT

Why not? Wayland support doesn't affect X11-on-Xorg, as pkg-message noted, still disabled at runtime by default and this is -devel port you're no longer listed as maintainer.

FWIW, other ports *build* with Wayland by default (since bug 227509) per "batteries included" policy in order to make binary packages useful for as many users as possible.
Comment 10 commit-hook freebsd_committer freebsd_triage 2025-01-15 16:05:28 UTC
A commit in branch main references this bug:

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

commit 2922123124772866f25f8e7e2ea884d5624e533f
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2025-01-15 16:02:49 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2025-01-15 16:02:49 +0000

    emulators/wine-devel: Use option helpers for WAYLAND

    PLIST_SUB was already active, so nothing to explicitly do regarding
    pkg-plist.

    PR:             282825
    Suggested by:   vvd

 emulators/wine-devel/Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2025-04-11 15:37:23 UTC
A commit in branch main references this bug:

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

commit 8ad1a9300a3f2d42a7c8a13e54ec4a11b9592d7d
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2025-04-11 12:50:57 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2025-04-11 15:36:28 +0000

    emulators/wine: Add Wayland support

    This backports commits cb6e55988b6fc6 and 29221231247728 from
    emulators/wine-devel, just sorts in additions a bit more logically.

    Wayland support is not on by default (yet).

    PR:             282825

 emulators/wine/Makefile             | 11 ++++++++---
 emulators/wine/files/pkg-message.in |  8 ++++++++
 emulators/wine/pkg-plist            |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)