Re: [OE-core] [PATCH 1/1] [mesa] Update do_install as needed per upstream changes

[Alexander Kanavin <alex.kanavin@gmail.com>]

On Mon, 22 Apr 2024 at 16:50, Joseph Mills via lists.openembedded.org
<joseph.mills=cnhind.com@lists.openembedded.org> wrote:
>
> Signed-off-by: Joseph Mills <joseph.mills@cnhind.com>
>
> Developer's Certificate of Origin 1.1
...

Please remove the text of the DCO from the commit message, it is
entirely unnecessary.

Commit title should be 'mesa: correct sed expression in do_install to
match upstream changes'.

>  #because we cannot rely on the fact that all apps will use pkgconfig,
> -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> +#make eglplatform.h independent of USE_X11
>  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

Is there a way to make this into a proper source code patch that can
be applied in a way that would fail when upstream changes the code?
Sed expressions are notoriously unreliable, and this can well again
quietly regress.

What is this patching really needed for, and why do we need to do it
after the fact? Is there some issue that needs to be resolved
upstream? I'm honestly tempted to drop this rather horrible snippet
altogether, and force people to resolve it properly.

Alex