Bug 518256 – x11-base/xorg-server-1.16.0 has glamor built-in, don't require it for radeonsi

• Product: Gentoo Linux
• Status: RESOLVED INVALID

[Description Konstantin M 2014-07-26 16:27:47 UTC]

With xorg-server-1.16.0 glamor was merged into xorg-server (probably from xorg-server-1.15.903 onward). But still x11-base/xorg-drivers-1.16 requires it for the driver x11-drivers/xf86-video-ati with video_cards_radeonsi. Therefore glamor-0.6.0-r1 gets pulled in and overwrites xorg-server's glamor (verifyable via Xorg.0.log, which prints the glamoregl version on X start).

I think the following modifications are necessary:
- xorg-server-1.16.0: make the "glamor" use flag enable the configure option "--enable-glamor"
- xorg-server-1.16.0: --enable-glamor needs media-libs/libepoxy. Depend on libepoxy-1.2 if the "glamor" use flag is active
- xorg-server-1.16.0: block x11-libs/glamor
- xf86-video-ati-7.4.0 and newer: depend on xorg-server-1.16.0[glamor] (or later) if xorg-server-1.16.0 is installed, depend on x11-libs/glamor for releases prior to xorg-server-1.15.903
- xf86-video-ati-7.4.0 and newer: switch on glamor if use flag "video_cards_radeonsi" is active (is that necessary/possible ?)
- xorg-drivers-1.16: remove dependency on glamor useflag from xf86-video-ati if use flag "video_cards_radeonsi" is active

Reproducible: Always

Steps to Reproduce:
1. emerge xorg-server-1.16.0 with "video_cards_radeon"
2. glamor-0.6.0-r1 is pulled in
3. Xorg.0.log says "compiled for 1.16.0, module version = 0.6.0" - correct would be "1.0.0"
Actual Results:  
Old glamor is used for acceleration

Expected Results:  
Glamor should not have been pulled in, the build-in glamor should have been used

[Comment 1 Konstantin M 2014-07-26 17:16:22 UTC]

Hm, from looking at the ebuilds more closely, it looks as the ebuilds might be correct (as I described above) already. My problem is that I cannot enable glamor on xorg-server (it gets displayed as "(-glamor)" when running "emerge -v1a xorg-server" even though I enabled it in packages.use).

I'll investigate why and report back here.

[Comment 2 Konstantin M 2014-07-26 18:31:36 UTC]

As I learned from irc and "man emerge" for "--verbose": brackets mean a masked useflag.

To unmask the useflag, you need to  put "x11-base/xorg-server -glamor" into /etc/portage/profile/package.use.mask (thanks to notben on irc !).

That solves the issue and makes emerge behave as expected - so the ebuilds are fine. Sorry for the noise.