Bug 732298

Summary:	x11-base/xorg-server-9999 renames some variables and breaks x11-drivers/xf86-video-*
Product:	Gentoo Linux	Reporter:	cyrillic <cyrilmaley>
Component:	Current packages	Assignee:	Gentoo X packagers <x11>
Status:	RESOLVED UPSTREAM
Severity:	normal	CC:	jstein
Priority:	Normal	Keywords:	PATCH
Version:	unspecified
Hardware:	All
OS:	Linux
URL:	https://gitlab.freedesktop.org/xorg/xserver/-/commit/ea47af87f692b291a988834c6f14d73a08cb1d75
Whiteboard:
Package list:		Runtime testing required:	---
Attachments:	amdgpu_rename.patch ati_rename.patch intel_rename.patch nouveau_rename.patch

Description cyrillic 2020-07-11 22:53:12 UTC

x11-base/xorg-server-9999 renames some variables and breaks x11-drivers/xf86-video-*

master/slave has been changed to primary/secondary which breaks API/ABI

Reproducible: Always




I am sure upstream will fix this soon, but in the meantime these patches do the trick.

All I had to do was use sed to generate them :
s/master/primary/g and s/slave/secondary/g

Comment 1 cyrillic 2020-07-11 22:54:27 UTC

Created attachment 648982 [details, diff]
amdgpu_rename.patch

Comment 2 cyrillic 2020-07-11 22:55:08 UTC

Created attachment 648984 [details, diff]
ati_rename.patch

Comment 3 cyrillic 2020-07-11 22:55:50 UTC

Created attachment 648986 [details, diff]
intel_rename.patch

Comment 4 cyrillic 2020-07-11 22:56:35 UTC

Created attachment 648988 [details, diff]
nouveau_rename.patch

Comment 5 Matt Turner gentoo-dev

2020-07-12 16:30:05 UTC

As you say, this is something we expect to be fixed upstream.

Comment 6 cyrillic 2020-07-25 22:17:59 UTC

amdgpu is now fixed with this commit :
https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/commit/0d1d479ecca424120ae1b0f16f9009aec64e5164

Comment 7 cyrillic 2020-11-20 01:11:31 UTC

Intel was fixed a couple of days ago. Ati and Nouveau remain.