Page MenuHomeFreeBSD

graphics/wayland: update to 1.19.0
ClosedPublic

Authored by jbeich on Jan 28 2021, 12:12 PM.

Details

Reviewers
manu
Group Reviewers
x11
Commits
rP563194: graphics/wayland: update to 1.19.0
Summary

See ChangeLog. Includes bug 246189 as well.

Test Plan
  • Builds fine 11.4 amd64/i386, 12.1 amd64/i386, 12.2 aarch64/amd64/i386, 13.0 aarch64/amd64/armv6/armv7/i386.
  • Runs fine on 13.0 amd64 (host), 11.4 i386 (jail). Tested via Sway, Cage, Firefox, foot, mpv+vaapi, glmark2-wayland, vkcube-wayland. Dogfooding since 1.18.91.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

graphics/wayland/files/patch-src_wayland-server.c
69 ↗(On Diff #83040)

Can't use SOL_LOCAL because it's missing on DragonFly and FreeBSD 11.4/12.1.

83 ↗(On Diff #83040)

Should I use Git instead? For example, https://cgit.freebsd.org/src/commit/?id=c5afec6e895a

Some comments but otherwise looks good to me.

graphics/wayland/files/patch-src_wayland-server.c
69 ↗(On Diff #83040)

Why not using some #ifdef __FreeBSD_version then like it is below ?

83 ↗(On Diff #83040)

Yes please.

  • Switch to SOL_LOCAL on FreeBSD >= 12.2
  • Switch to Git URL
  • Hint where DragonFly hasn't caught up to FreeBSD
jbeich added inline comments.
graphics/wayland/files/patch-src_wayland-server.c
69 ↗(On Diff #83040)

SOL_LOCAL exists on 12.2, see https://cgit.freebsd.org/src/commit/?id=bb43bdcfb04d
cr_pid wasn't backported due to miscommunication and reluctance to MFC stuff committed by others.

graphics/wayland/files/patch-src_wayland-server.c
21 ↗(On Diff #83046)

Why 0 ?
SOL_SOCKET is 0xffff and we should fallback to it if SOL_LOCAL isn't present.

69 ↗(On Diff #83040)
graphics/wayland/files/patch-src_wayland-server.c
21 ↗(On Diff #83046)

bb43bdcfb04d changed a consumer in libc from 0 to SOL_LOCAL. According to bug 246189: "with SOL_SOCKET, the value of LOCAL_PEERCRED is interpreted as SO_DEBUG".

69 ↗(On Diff #83040)

Are you suggesting to increase the maze of conditionals? Besides, existing style in other patches favors ifdefs over __FreeBSD_version checks.

manu added inline comments.
graphics/wayland/files/patch-src_wayland-server.c
21 ↗(On Diff #83046)

Ok so we want SOL_LOCAL everywhen then, got it.

69 ↗(On Diff #83040)

Based on the SOL_LOCAL discussion I'm fine with the current approch.

This revision is now accepted and ready to land.Jan 28 2021, 6:09 PM
This revision was automatically updated to reflect the committed changes.