[bug#66964] Request for merging "mesa-updates" branch

[bug#66964] Request for merging "mesa-updates" branch

[John Kehayias via Guix-patches via]

Hello,

This is to start the process for merging the "mesa-updates" branch. A set of commits was just pushed there and the CI already has a build job for this branch. It is only 12 commits currently, but will be a lot of builds due mostly to the ungrafting of libx11 (and certain package updates beyond mesa itself, like pixman, libdrm, etc.). So, mostly waiting for things to build and hoping no major breakages. The ungrafts and version updates shouldn't be huge changes but you never know.

Please feel free to report any issues here and I'll update as well as things go.

Thanks!
John

[bug#66964] Request for merging "mesa-updates" branch

[dan]

Hi John,

I noticed one of my commit #65153 is on the mesa-update branch, it 
would be helpful if you could take a look at #65155, an update 
trying to export XDG_DATA_DIRS for mesa.  Since no one replied 
there, I'm not sure if this change is appropriate and if it fits 
in this update.

-- 
dan

[bug#66964] Request for merging "mesa-updates" branch

[John Kehayias via Guix-patches via]

Hi dan,

On Thu, Nov 09, 2023 at 09:43 PM, dan wrote:

> Hi John,
>
> I noticed one of my commit #65153 is on the mesa-update branch, it
> would be helpful if you could take a look at #65155, an update trying
> to export XDG_DATA_DIRS for mesa.  Since no one replied there, I'm not
> sure if this change is appropriate and if it fits in this update.

Apologies I did not see this message as I think you only sent it to the
bug number (which does not get sent to anyone else as far as I know). I
had meant to respond to #65155 but I think I forgot. I did have a note
on the thread on guix-devel about this briefly:

> I don't think this is a correct change as written (search-path should
> be in vulkan-loader if I'm understanding what is supposed to happen
> here). Anyway, will follow up on that issue and left it out for now.

I'll follow up on that bug number directly to discuss.

Sorry for the miscommunication!

John

Re: mesa-updates: call for patches

[John Kehayias]

> Details of changes below, which included some more ungrafting:
>
>>> Here is a list of what has been on my radar and I'll be looking to
>>> apply on the mesa-updates branch. If there's something I missed and
>>> you think makes sense here (e.g. lower level graphical/X related
>>> libraries) please let me know. And yes, I need to make a Mesa team. It
>>> is on my list!
>>>
>>> 1. ungraft libx11 and libxpm
>>>
>
> These are done.
>
> Also, since I didn't realize libx11 means building python, and rust,
> and so on, I figured I would ungraft more that was being rebuilt
> anyway. So nghttp2 and curl have been ungrafted.
>
> The only more involved change was in ungrafting curl (to keep another
> test skip for Hurd), in
> <https://git.savannah.gnu.org/cgit/guix.git/commit/?id=00442f15d46cd9d5d02499827946d23426aad0ba&h=mesa-updates>
> and then running parallel tests (very nice speed up for building curl
> I came across in the documentation!) in
> <https://git.savannah.gnu.org/cgit/guix.git/commit/?id=d70f2b788e56545f93dc24238d2617e20fde7460&h=mesa-updates>.
> Please do take a look in case I missed something here, but all built
> fine locally on x86_64 at least.
>
>>> 2. update mesa (23.2.1)
>>>
>>> 3. <https://issues.guix.gnu.org/65375> (libepoxy fix for GTK, see
>>> <https://issues.guix.gnu.org/64981>)
>>>
>
> These are done.
>
>>> 4. <https://issues.guix.gnu.org/65155> (mesa vulkan search-paths)
>>>
>
> I don't think this is a correct change as written (search-path should
> be in vulkan-loader if I'm understanding what is supposed to happen
> here). Anyway, will follow up on that issue and left it out for now.
>
>>> 5. <https://issues.guix.gnu.org/65153> (sdl2 vulkan-loader; and update sdl2?)
>>>
>>> 6. <https://issues.guix.gnu.org/64637> (libdrm update; to even newer version now)
>>>
>>> 7. <https://issues.guix.gnu.org/66727> (libxkbcommon update)
>>>
>>> 8. <https://issues.guix.gnu.org/64639> (pixman update)
>>>
>
> All these done (sdl2 was also updated to latest version).
>
>>> 9. submit patch for mesa team
>>>
>
> But not this one, the easy one :) It will be sent.
>
>>> Thanks everyone! And when you see the updates pushed on mesa-updates
>>> and builds become available, please do test and let me know. Or if
>>> you'd like to join this team of one, happy to have you on board.
>>
>> Sounds like a fine plan!  Thank you for tackling this!
>
> Happy to! Substitutes will eventually become available, but there's
> quite a few builds to be done. This takes care of some ungrafts and
> updates with I hope minimal disruption. I'll be keeping an eye out and
> using locally as well. Please test and report, thanks everyone!
>
> John

An issue was created to track merging the mesa-updates branch here:
<https://issues.guix.gnu.org/66964>. Please use that bug number as
needed (and cc me or use wide-reply in emacs debbugs).

[bug#66964] mesa-updates: call for patches

[Kaelyn via Guix-patches via]

Hi,

I've just submitted a pair of patches for the mesa-updates branch: <https://issues.guix.gnu.org/67136> updating xorgproto and xorg-server-xwayland. The xorgproto is a high-impact update (guix refresh reports rebuilding 8710 packages would ensure 22871 dependent packages are rebuilt), but required to update to the latest xwayland as xwayland requires a newer version of presentproto than in the current guix xorgproto package. The updating and ungrafting of mesa and a number of X.org related libraries seemed like a good time (and place) to update xorgproto as well.

Cheers,
Kaelyn

Re: bug#66964: Request for merging "mesa-updates" branch

[John Kehayias]

Hi Kaelyn,

On Sun, Nov 12, 2023 at 08:01 PM, Kaelyn wrote:

> Hi,
>
> I've just submitted a pair of patches for the mesa-updates branch:
> <https://issues.guix.gnu.org/67136> updating xorgproto and
> xorg-server-xwayland. The xorgproto is a high-impact update (guix
> refresh reports rebuilding 8710 packages would ensure 22871 dependent
> packages are rebuilt), but required to update to the latest xwayland
> as xwayland requires a newer version of presentproto than in the
> current guix xorgproto package. The updating and ungrafting of mesa
> and a number of X.org related libraries seemed like a good time (and
> place) to update xorgproto as well.
>
> Cheers,
> Kaelyn

Thanks for the patches. I think mesa-updates in this current iteration
is set on builds (ended up being a lot more due to the ungrafting but
seems done on our main architectures for several days now). I had to
make some other changes to fix some larger breakages but at this point I
think it will just be taking us back in the build queue too much.

So I think it would make more sense on the next big rebuild, either
core-updates (talk about doing that with more ungrafts right now) or
I'll do mesa-updates again when the next release of mesa hits. Or maybe
it makes sense to just do another branch for xwayland?

Open to ideas! I'll send a separate message soon on the status of
mesa-updates and see what people think, but my thought was to merge this
to master in the next day or so if there are no objections.

Thanks!
John

[bug#66964] Request for merging "mesa-updates" branch

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2255 bytes --]

On Tue, Nov 14, 2023 at 08:11:08PM +0000, John Kehayias wrote:
> Hi Kaelyn,
> 
> On Sun, Nov 12, 2023 at 08:01 PM, Kaelyn wrote:
> 
> > Hi,
> >
> > I've just submitted a pair of patches for the mesa-updates branch:
> > <https://issues.guix.gnu.org/67136> updating xorgproto and
> > xorg-server-xwayland. The xorgproto is a high-impact update (guix
> > refresh reports rebuilding 8710 packages would ensure 22871 dependent
> > packages are rebuilt), but required to update to the latest xwayland
> > as xwayland requires a newer version of presentproto than in the
> > current guix xorgproto package. The updating and ungrafting of mesa
> > and a number of X.org related libraries seemed like a good time (and
> > place) to update xorgproto as well.
> >
> > Cheers,
> > Kaelyn
> 
> Thanks for the patches. I think mesa-updates in this current iteration
> is set on builds (ended up being a lot more due to the ungrafting but
> seems done on our main architectures for several days now). I had to
> make some other changes to fix some larger breakages but at this point I
> think it will just be taking us back in the build queue too much.
> 
> So I think it would make more sense on the next big rebuild, either
> core-updates (talk about doing that with more ungrafts right now) or
> I'll do mesa-updates again when the next release of mesa hits. Or maybe
> it makes sense to just do another branch for xwayland?
> 
> Open to ideas! I'll send a separate message soon on the status of
> mesa-updates and see what people think, but my thought was to merge this
> to master in the next day or so if there are no objections.

If the mesa branch is ready to merge so soon then I think we should just
get that merged and then I'll rebase the rust-team branch on top of new
master.  The rust-team branch is also ready to merge, but we're way
behind on aarch64 substitutes.  Either way the substitute servers will
be rebuilding all of rust so I think it'd be better to merge in
mesa-updates and then do rust.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#66964] Request for merging "mesa-updates" branch

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2255 bytes --]

On Tue, Nov 14, 2023 at 08:11:08PM +0000, John Kehayias wrote:
> Hi Kaelyn,
> 
> On Sun, Nov 12, 2023 at 08:01 PM, Kaelyn wrote:
> 
> > Hi,
> >
> > I've just submitted a pair of patches for the mesa-updates branch:
> > <https://issues.guix.gnu.org/67136> updating xorgproto and
> > xorg-server-xwayland. The xorgproto is a high-impact update (guix
> > refresh reports rebuilding 8710 packages would ensure 22871 dependent
> > packages are rebuilt), but required to update to the latest xwayland
> > as xwayland requires a newer version of presentproto than in the
> > current guix xorgproto package. The updating and ungrafting of mesa
> > and a number of X.org related libraries seemed like a good time (and
> > place) to update xorgproto as well.
> >
> > Cheers,
> > Kaelyn
> 
> Thanks for the patches. I think mesa-updates in this current iteration
> is set on builds (ended up being a lot more due to the ungrafting but
> seems done on our main architectures for several days now). I had to
> make some other changes to fix some larger breakages but at this point I
> think it will just be taking us back in the build queue too much.
> 
> So I think it would make more sense on the next big rebuild, either
> core-updates (talk about doing that with more ungrafts right now) or
> I'll do mesa-updates again when the next release of mesa hits. Or maybe
> it makes sense to just do another branch for xwayland?
> 
> Open to ideas! I'll send a separate message soon on the status of
> mesa-updates and see what people think, but my thought was to merge this
> to master in the next day or so if there are no objections.

If the mesa branch is ready to merge so soon then I think we should just
get that merged and then I'll rebase the rust-team branch on top of new
master.  The rust-team branch is also ready to merge, but we're way
behind on aarch64 substitutes.  Either way the substitute servers will
be rebuilding all of rust so I think it'd be better to merge in
mesa-updates and then do rust.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]