* [Poky] Do install append to mesa does nothing in scarthgap
@ 2024-04-20 22:39 joseph.mills
2024-04-20 22:41 ` joseph.mills
0 siblings, 1 reply; 5+ messages in thread
From: joseph.mills @ 2024-04-20 22:39 UTC (permalink / raw
To: yocto-patches
[-- Attachment #1.1: Type: text/plain, Size: 591 bytes --]
Line of code does nothing because the upstream code of mesa has changed.
https://git.yoctoproject.org/poky/tree/meta/recipes-graphics/mesa/mesa.inc?h=scarthgap#n31
That line shows the replacement of #elif defined(__unix__) && defined(EGL_NO_X11)
This has changed upstream to #elif defined(USE_X11)
Upstream (kirkstone)
https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-24.0.2/include/EGL/eglplatform.h?ref_type=tags#L112
Upstream (kirkstone'ish)
https://gitlab.freedesktop.org/mesa/mesa/-/blob/58ad6e52d1983785e951726f6940aa30e46bc462/include/EGL/eglplatform.h#L125
[-- Attachment #1.2: Type: text/html, Size: 1032 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: mesa-nox11-egl-upstream-changes.patch --]
[-- Type: text/x-diff; name="mesa-nox11-egl-upstream-changes.patch", Size: 897 bytes --]
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6e96190084..36a16d3b2b 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -32,7 +32,7 @@ do_install:append() {
# sed can't find EGL/eglplatform.h as it doesn't get installed when glvnd enabled.
# So, check if EGL/eglplatform.h exists before running sed.
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)} && [ -f ${D}${includedir}/EGL/eglplatform.h ]; then
- sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+ sed -i -e 's/^#elif defined(USE_X11)$/#elif ${@bb.utils.contains('PACKAGECONFIG', 'x11', '1', '0', d)}/' ${D}${includedir}/EGL/eglplatform.h
fi
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Poky] Do install append to mesa does nothing in scarthgap
2024-04-20 22:39 [Poky] Do install append to mesa does nothing in scarthgap joseph.mills
@ 2024-04-20 22:41 ` joseph.mills
2024-04-22 9:23 ` Quentin Schulz
0 siblings, 1 reply; 5+ messages in thread
From: joseph.mills @ 2024-04-20 22:41 UTC (permalink / raw
To: yocto-patches
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
Edit
Upstream ( *scarthgap* )
https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-24.0.2/include/EGL/eglplatform.h?ref_type=tags#L112
Upstream (kirkstone'ish)
https://gitlab.freedesktop.org/mesa/mesa/-/blob/58ad6e52d1983785e951726f6940aa30e46bc462/include/EGL/eglplatform.h#L125
[-- Attachment #2: Type: text/html, Size: 552 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [yocto-patches] [Poky] Do install append to mesa does nothing in scarthgap
@ 2024-04-22 9:23 ` Quentin Schulz
0 siblings, 0 replies; 5+ messages in thread
From: Quentin Schulz @ 2024-04-22 9:23 UTC (permalink / raw
To: yocto-patches
Hi Joseph,
Good catch, can you please send a patch following our process?
https://docs.yoctoproject.org/contributor-guide/index.html let us know
if you have questions.
The change seems to be merged into mesa 22.3.0 and 23.0+, c.f.
https://gitlab.freedesktop.org/mesa/mesa/-/commit/96894e6746c199cb8a5b8356f75c2ee8f28e68b1
So I think this means we should backport this to Mickledore and Nanbield
as well, according to the versions reported here
https://layers.openembedded.org/layerindex/recipe/5605/.
Thanks,
Quentin
On 4/21/24 00:41, joseph.mills via lists.yoctoproject.org wrote:
> You don't often get email from joseph.mills=cnhind.com@lists.yoctoproject.org. Learn why this is important<https://aka.ms/LearnAboutSenderIdentification>
>
> Edit
>
>
>
> Upstream (scarthgap)
>
> https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-24.0.2/include/EGL/eglplatform.h?ref_type=tags#L112
>
>
>
> Upstream (kirkstone'ish)
>
> https://gitlab.freedesktop.org/mesa/mesa/-/blob/58ad6e52d1983785e951726f6940aa30e46bc462/include/EGL/eglplatform.h#L125
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [yocto-patches] [Poky] Do install append to mesa does nothing in scarthgap
@ 2024-04-22 9:23 ` Quentin Schulz
0 siblings, 0 replies; 5+ messages in thread
From: Quentin Schulz @ 2024-04-22 9:23 UTC (permalink / raw
To: yocto-patches
Hi Joseph,
Good catch, can you please send a patch following our process?
https://docs.yoctoproject.org/contributor-guide/index.html let us know
if you have questions.
The change seems to be merged into mesa 22.3.0 and 23.0+, c.f.
https://gitlab.freedesktop.org/mesa/mesa/-/commit/96894e6746c199cb8a5b8356f75c2ee8f28e68b1
So I think this means we should backport this to Mickledore and Nanbield
as well, according to the versions reported here
https://layers.openembedded.org/layerindex/recipe/5605/.
Thanks,
Quentin
On 4/21/24 00:41, joseph.mills via lists.yoctoproject.org wrote:
> You don't often get email from joseph.mills=cnhind.com@lists.yoctoproject.org. Learn why this is important<https://aka.ms/LearnAboutSenderIdentification>
>
> Edit
>
>
>
> Upstream (scarthgap)
>
> https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-24.0.2/include/EGL/eglplatform.h?ref_type=tags#L112
>
>
>
> Upstream (kirkstone'ish)
>
> https://gitlab.freedesktop.org/mesa/mesa/-/blob/58ad6e52d1983785e951726f6940aa30e46bc462/include/EGL/eglplatform.h#L125
>
>
>
> _._,_._,_
> ________________________________
> Links:
>
> You receive all messages sent to this group.
>
> View/Reply Online (#49)<https://lists.yoctoproject.org/g/yocto-patches/message/49> | Reply To Group<mailto:yocto-patches@lists.yoctoproject.org?subject=Re:%20Re%3A%20%5Byocto-patches%5D%20%5BPoky%5D%20Do%20install%20append%20to%20mesa%20does%20nothing%20in%20scarthgap> | Reply To Sender<mailto:joseph.mills@cnhind.com?subject=Private:%20Re:%20Re%3A%20%5Byocto-patches%5D%20%5BPoky%5D%20Do%20install%20append%20to%20mesa%20does%20nothing%20in%20scarthgap> | Mute This Topic<https://lists.yoctoproject.org/mt/105643681/6293953> | New Topic<https://lists.yoctoproject.org/g/yocto-patches/post>
> Your Subscription<https://lists.yoctoproject.org/g/yocto-patches/editsub/6293953> | Contact Group Owner<mailto:yocto-patches+owner@lists.yoctoproject.org> | Unsubscribe<https://lists.yoctoproject.org/g/yocto-patches/leave/13168703/6293953/1843281461/xyzzy> [quentin.schulz@theobroma-systems.com]
>
> _._,_._,_
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Poky] Do install append to mesa does nothing in scarthgap
2024-04-22 9:23 ` Quentin Schulz
(?)
@ 2024-04-22 12:59 ` joseph.mills
-1 siblings, 0 replies; 5+ messages in thread
From: joseph.mills @ 2024-04-22 12:59 UTC (permalink / raw
To: yocto-patches
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
On Mon, Apr 22, 2024 at 04:23 AM, Quentin Schulz wrote:
>
> So I think this means we should backport this to Mickledore and Nanbield
> as well, according to the versions reported here https://layers.openembedded.org/layerindex/recipe/5605/
> .
Sure give me some time.
[-- Attachment #2: Type: text/html, Size: 394 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-22 12:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-20 22:39 [Poky] Do install append to mesa does nothing in scarthgap joseph.mills
2024-04-20 22:41 ` joseph.mills
2024-04-22 9:23 ` [yocto-patches] " Quentin Schulz
2024-04-22 9:23 ` Quentin Schulz
2024-04-22 12:59 ` joseph.mills
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.