[OE-core] [PATCH] mesa: Upgrade 19.1.6 -> 19.2.1

[Alexander Kanavin]

On Fri, 11 Oct 2019 at 22:20, Fabio Berton <fabio.berton at ossystems.com.br>
wrote:

>   - Update patches with devtool finish --force-patch-refresh


I'm not sure what you did exactly, but one of the patches below is
incorrectly updated.

Do use 'devtool upgrade', which properly rebases the patches and allows you
to resolve conflicts.


> +@@ -382,6 +382,10 @@ if not with_platform_android or
> get_option('platform-sdk-version') >= 29
> +   pre_args += '-DUSE_ELF_TLS'
>   endif
>
> --pre_args += '-DGLX_USE_TLS'
>  +if get_option('glx-tls')
>  +  pre_args += '-DGLX_USE_TLS'
>  +endif
> ++
>   if with_glx != 'disabled'
>     if not (with_platform_x11 and with_any_opengl)
>       error('Cannot build GLX support without X11 platform support and at
> least one OpenGL API')
>

The fact that 'pre_args += '-DGLX_USE_TLS' is no longer present in the file
should've raised suspicions, and indeed:
"mesa: Rename GLX_USE_TLS to USE_ELF_TLS."
https://gitlab.freedesktop.org/mesa/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2

Alex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20191011/71011807/attachment-0001.html>