Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 801478

Summary: x11-base/xwayland-9999 request
Product: Gentoo Linux Reporter: Duncan <1i5t5.duncan>
Component: Current packagesAssignee: Gentoo X packagers <x11>
Status: RESOLVED FIXED    
Severity: normal CC: ionen, slashbeast
Priority: Normal    
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Attachments: Patch created from xwayland-21.1.1-r2.ebuild
xwayland-9999.ebuild
patch 1 main meson.build
patch 2 main meson_options
patch 3 vfb meson.build

Description Duncan 2021-07-10 13:39:49 UTC
Working on bug #799797 I need an xwayland-9999 to try to bisect.  While many of the other X packages have a live-9999 version split xwayland is new enough that it doesn't have that live-9999 version yet.

I'm going to try to create one based on xorg-server-9999 and the existing xwayland release ebuilds.  If I'm successful I'll attach it.
Comment 1 Don O 2021-07-22 13:23:48 UTC
Created attachment 725866 [details, diff]
Patch created from xwayland-21.1.1-r2.ebuild

Diff patch from xwayland-21.1.1-r2 ebuild
Comment 2 Don O 2021-10-13 20:07:59 UTC
Created attachment 744789 [details]
xwayland-9999.ebuild

created an xwayland-9999 based off the xorg-server-9999, and a set of patches for meson. It produces the same thing as xwayland, Xwayland server, man page, pkgconfig file, and a Readme. 

I set the patches in /etc/portage/patches, they could easily be put in the files directory and the named added to the ebuild. I leave that up to the gentoo devs if they want to use this ebuild.

Enjoy
Comment 3 Don O 2021-10-13 20:10:47 UTC
Created attachment 744792 [details, diff]
patch 1 main meson.build

Patches main meson.build
Comment 4 Don O 2021-10-13 20:11:30 UTC
Created attachment 744795 [details, diff]
patch 2 main meson_options

Patches main meson_options
Comment 5 Don O 2021-10-13 20:12:20 UTC
Created attachment 744798 [details, diff]
patch 3 vfb meson.build

Third and final patch, works on vfb/meson.build
Comment 6 Piotr Karbowski (RETIRED) gentoo-dev 2022-04-05 20:51:58 UTC
The 9999 ebuild is tricky, because the development goes on master branch, however then it is branched to the side and some code, like xserver, is stripped there. I see no interface to just build xwayland out of master branch.

Some significant changes upstream are required first.
Comment 7 Duncan 2022-04-05 21:50:50 UTC
(In reply to Piotr Karbowski from comment #6)
> The 9999 ebuild is tricky, because the development goes on master branch,
> however then it is branched to the side and some code, like xserver, is
> stripped there. I see no interface to just build xwayland out of master
> branch.
> 
> Some significant changes upstream are required first.

That explains why I had so much trouble making heads or tails of it.  I thought my git-fu (and dev-fu) just wasn't strong enough (still partly the case as Don O seems to have gotten farther than I did).

Meanwhile, they evidently eventually figured out and fixed the problem that triggered the original request (even if it's still unknown "magic" to me, which I don't like as I'm no closer to fixing it if the problem returns), so while a live ebuild could still be handy for bisecting other potential problems, it's not the "missing tool I need right now" that it was at the time.
Comment 8 Larry the Git Cow gentoo-dev 2022-04-18 20:26:17 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7267981751efbc38cef7d90bc1fb0f857b42648a

commit 7267981751efbc38cef7d90bc1fb0f857b42648a
Author:     Piotr Karbowski <slashbeast@gentoo.org>
AuthorDate: 2022-04-18 20:25:29 +0000
Commit:     Piotr Karbowski <slashbeast@gentoo.org>
CommitDate: 2022-04-18 20:26:15 +0000

    x11-base/xwayland: added live ebuild.
    
    Closes: https://bugs.gentoo.org/801478
    Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>

 ...yland-drop-redundantly-installed-files_v2.patch |  30 ++++++
 x11-base/xwayland/xwayland-9999.ebuild             | 104 +++++++++++++++++++++
 2 files changed, 134 insertions(+)
Comment 9 Piotr Karbowski (RETIRED) gentoo-dev 2022-04-18 20:26:43 UTC
Figured out the build system, please check if it works as expected for you.
Comment 10 Duncan 2022-06-27 22:40:07 UTC
(In reply to Piotr Karbowski from comment #9)
> Figured out the build system, please check if it works as expected for you.

Two months belated, but yes, seems to be working.  (Tho I just did a --buildpkgonly and a compare of the resulting files against currently merged 22.1.2 release, without actually merging the -9999 package.)

Thank you!  I'll have -9999 to test next time something goes wrong, which could be useful as xwayland is the only X I have merged now (no xorg merged, tho I do have ~amd64 weston as a backup for my live-git kwin-9999 wayland compositor).