xorg: upgrade to 21.1.3

[bapt]

Summary

Port changes:

• flavorize the port
• decouple Xwayland as it has been split from Xorg
• switch to meson
• cleanup non necessary patches anymore
• stop butchering the build system to play with Xorg.wrap but do it in post install
• Remove mesa-dri dependency where not needed
• remove dmx

[bapt]

more patches and fixed

[bapt]

chase flavor change

[bapt]

force dri everywhere

[bapt]

really ensure secure RPC everywhere

[bapt]

Add missing libxcvt

[bapt]

Add missing xcb-renderutil for Xephyr

[bapt]

Add more missing xcb dependencies for Xephyr

[bapt]

Incorporate fixes for ATI

[manu]

Everything builds correctly now for me, the patches looks ok as said privately, I'll try to test asap.

[vishwin]

xinit now cannot launch the server:

X: Missing execute permissions for /usr/local/libexec/Xorg: No such file or directory

This file seems required for xinit to function, and a quick glance at Arch Linux's package reveals its presence there.

[vishwin]

x11-servers/xorg-server/Makefile

16

check-sanity balks at the capitalised flavours, had to lowercase them when testporting or bulk -t

158

This is not needed, meson does this part correctly. The only file that needs suid set is libexec/Xorg

[vishwin]

x11-servers/xorg-server/Makefile

52–74

Need to add a -Dlog_dir=/var/log else the default system log location is /var/local/log

[vishwin]

x11-servers/xorg-server/Makefile

140

This can probably get dispensed of as well. libglvnd already handles moderating between the different implementations in principle, and nvidia-driver doesn't install to the same target. In any case, glx actually fails to load during startup because it is not in the correct extensions directory:

[265216.865] (II) LoadModule: "glx"
[265216.866] (WW) Warning, couldn't open module glx
[265216.866] (EE) Failed to load module "glx" (module does not exist, 0)

multimedia/obs-studio fails to launch probably due to this.

[bapt]

address some comments

[tcberner]

x11-servers/xorg-server/Makefile

27

^ below you have xephyr not Xephyr (line 87)

[vishwin]

x11-servers/xorg-server/Makefile

52–74

ping, because we don't have /var/local/log

x11-servers/xorg-server/pkg-plist

176

suid-ing Xorg.wrap doesn't do anything since it's a shell script, libexec/Xorg the binary needs the suid

[bapt]

Xorg running as user (the wrapper now does its job)

[bapt]

Readd the glx danse necessary to play nicely with nvidia

[bapt]

x11-servers/xorg-server/pkg-plist

176

wrong 1 it is not a shell, 2 it works with my latest update

[bapt]

forgot to git mv pkg-descr

[bapt]

fix orphan /var/lib

[bapt]

grmbl

[bapt]

rebase

[bapt]

Remove SUID option

[bapt]

fix mismerge

[bapt]

more bad merge

[bapt]

grmbl(bis)

[tcberner]

Seems to work smoothly for me.

[jbeich]

• Remove mesa-dri dependency where not needed

Maybe add a note in UPDATING due to POLA violation when using xorg-minimal. For example, modesetting requires mesa-dri for glamor acceleration (in Xorg) and for OpenGL/Vulkan acceleration (in applications).

Fails to build on aarch64 (Tier1 on FreeBSD >= 13.0):

$ poudriere jail -cj 130aarch64 -x -a arm64.aarch64 -v 13.0-RELEASE
$ poudriere testport -j 130aarch64 x11-servers/xorg-server
[...]
ld: error: undefined symbol: xf86EnableIO
>>> referenced by xf86Configure.c
>>>               libxorg_common.a.p/xf86Configure.c.o:(DoConfigure) in archive hw/xfree86/common/libxorg_common.a
>>> referenced by xf86Events.c
>>>               libxorg_common.a.p/xf86Events.c.o:(xf86VTEnter) in archive hw/xfree86/common/libxorg_common.a
>>> referenced by xf86Init.c
>>>               libxorg_common.a.p/xf86Init.c.o:(InitOutput) in archive hw/xfree86/common/libxorg_common.a
>>> referenced 1 more times

ld: error: undefined symbol: xf86DisableIO
>>> referenced by xf86Events.c
>>>               libxorg_common.a.p/xf86Events.c.o:(xf86VTLeave) in archive hw/xfree86/common/libxorg_common.a

ld: error: undefined symbol: xf86OSInitVidMem
>>> referenced by vidmem.c
>>>               libxorg_os_support.a.p/shared_vidmem.c.o:(xf86InitVidMem) in archive hw/xfree86/os-support/libxorg_os_support.a
cc: error: linker command failed with exit code 1 (use -v to see invocation)

x11-servers/xorg-server/Makefile

7

21.1.3 (unlike 21.1.4) is vulnerable to CVE-2022-2319 + CVE-2022-2320

122

Maybe also drop USES+=ssl with .if ${SSL_DEFAULT} == base block.

$ poudriere testport -j 130amd64 x11-servers/xorg-server
[...]
====> Running Q/A tests (stage-qa)
Warning: you may not need USES=ssl

x11-servers/xorg-server/pkg-plist

4

To restore this file remove @comment in x11/libxcvt/pkg-plist (and bump PORTREVISION).

185

To restore this file remove @comment in x11/libxcvt/pkg-plist (and bump PORTREVISION).

[jbeich]

x11-servers/xorg-server/Makefile

112

Did you forget to restore the comment after D35661#816592 ("Readd the glx danse necessary to play nicely with nvidia")?

[bapt]

update to 21.1.4
Address @jbeich comments

[bapt]

Address @jbeich comments