From 2e395d80534dc0914989d81d51160fc34be3a2ec Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 12 Jun 2019 18:12:57 -0300 Subject: mesa: Update 19.0.6 -> 19.1.0 Update all patches to apply on 19.1.0 version. See full mesa 19.0.1 changes here: - https://www.mesa3d.org/relnotes/19.1.0.html (From OE-Core rev: b16c6d0452c79dcc2fccc4a7b9b2d68d53d2b353) Signed-off-by: Fabio Berton Signed-off-by: Richard Purdie --- ...2-meson.build-make-TLS-GLX-optional-again.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch (limited to 'meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch') diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch new file mode 100644 index 0000000000..81454aaa29 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch @@ -0,0 +1,54 @@ +From d31718999797ffc4dd177d14760ef7b8fd95ac2f Mon Sep 17 00:00:00 2001 +From: Fabio Berton +Date: Wed, 12 Jun 2019 14:15:57 -0300 +Subject: [PATCH 2/3] meson.build: make TLS GLX optional again +Organization: O.S. Systems Software LTDA. + +This was optional with autotools, and needs to be disabled +when using musl C library, for instance. + +Upstream-Status: Pending + +Signed-off-by: Alexander Kanavin +Signed-off-by: Fabio Berton +--- + meson.build | 4 +++- + meson_options.txt | 7 +++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index e11880f2902..7a07974ba61 100644 +--- a/meson.build ++++ b/meson.build +@@ -362,7 +362,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless) + endif + 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') +diff --git a/meson_options.txt b/meson_options.txt +index 1f72faabee8..fcd49efea27 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -339,6 +339,13 @@ option( + value : true, + description : 'Enable direct rendering in GLX and EGL for DRI', + ) ++option( ++ 'glx-tls', ++ type : 'boolean', ++ value : true, ++ description : 'Enable TLS support in GLX', ++) ++ + option( + 'I-love-half-baked-turnips', + type : 'boolean', +-- +2.22.0 + -- cgit v1.2.3-54-g00ecf