[mesa3d] Sync all patch files with DDK 1.17.

package/mesa3d/0044-meson-allow-libGL-to-be-built-without-GLX.patch

@@ -1,7 +1,7 @@
-From 43662126e9973c6cff496ba32fae3cf372e0646b Mon Sep 17 00:00:00 2001
+From 64e6997ded5825f10125313ea15e3164bdad769b Mon Sep 17 00:00:00 2001
 From: Brendan King <Brendan.King@imgtec.com>
 Date: Thu, 11 Jun 2020 12:29:51 +0100
-Subject: [PATCH 45/50] meson: allow libGL to be built without GLX
+Subject: [PATCH 44/67] meson: allow libGL to be built without GLX
 
 If Meson is run with option "glx" set to "null", build the
 OpenGL library without GLX.
@@ -15,16 +15,16 @@ with OpenGL on platforms other than X11.
  meson.build               |  8 ++++++--
  meson_options.txt         |  2 +-
  src/egl/main/eglcurrent.h |  7 +++----
- src/glx/meson.build       | 16 ++++++++++++----
+ src/glx/meson.build       | 20 ++++++++++++++++----
  src/meson.build           |  2 +-
- 5 files changed, 23 insertions(+), 12 deletions(-)
+ 5 files changed, 27 insertions(+), 12 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 3c55447b6eb..af020203752 100644
+index 21d93d372c2..8db1699729a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -459,6 +459,10 @@ else
-   with_egl = false
+@@ -485,6 +485,10 @@ if with_egl and not _platforms.contains(egl_native_platform)
+   error('-Degl-native-platform does not specify an enabled platform')
  endif
  
 +if with_egl and with_opengl and with_glx != 'disabled'
@@ -33,9 +33,9 @@ index 3c55447b6eb..af020203752 100644
 +
  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
  use_elf_tls = false
- if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
-@@ -466,7 +470,7 @@ if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()
-   use_elf_tls = true
+ if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
+@@ -502,7 +506,7 @@ if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
+   endif
  endif
  
 -if with_glx != 'disabled'
@@ -43,7 +43,7 @@ index 3c55447b6eb..af020203752 100644
    if not (with_platform_x11 and with_any_opengl)
      error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
    elif with_glx == 'gallium-xlib'
-@@ -528,7 +532,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3)
+@@ -564,7 +568,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3)
    error('Vulkan drivers require dri3 for X11 support')
  endif
  if with_dri
@@ -53,10 +53,10 @@ index 3c55447b6eb..af020203752 100644
    endif
  endif
 diff --git a/meson_options.txt b/meson_options.txt
-index 9073223e8f5..4038629544e 100644
+index d90a25f97ff..d36e714ea4c 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -267,7 +267,7 @@ option(
+@@ -290,7 +290,7 @@ option(
    'glx',
    type : 'combo',
    value : 'auto',
@@ -85,14 +85,18 @@ index 32570970947..dcc418afd6f 100644
  }
  
 diff --git a/src/glx/meson.build b/src/glx/meson.build
-index 58f9e1aa896..41ca936b8f4 100644
+index 8f642d5e14b..605a9717e37 100644
 --- a/src/glx/meson.build
 +++ b/src/glx/meson.build
-@@ -126,7 +126,11 @@ gl_lib_cargs = [
-   '-D_REENTRANT',
- ]
+@@ -122,7 +122,15 @@ else
+   )
+ endif
  
 -libglx = static_library(
++gl_lib_cargs = [
++  '-D_REENTRANT',
++]
++
 +if with_glx == 'null'
 +  libglx_link = [libglapi]
 +  libglx_link_whole = [libglapi_static]
@@ -101,7 +105,7 @@ index 58f9e1aa896..41ca936b8f4 100644
    'glx',
    [files_libglx, glx_generated],
    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glapi, inc_loader],
-@@ -143,13 +147,17 @@ libglx = static_library(
+@@ -138,13 +146,17 @@ libglx = static_library(
      idep_mesautil, idep_xmlconfig,
      dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd,
    ],
@@ -123,10 +127,10 @@ index 58f9e1aa896..41ca936b8f4 100644
    dependencies : [
      dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, dep_xcb_glx, dep_xcb,
 diff --git a/src/meson.build b/src/meson.build
-index d96c754a63d..a92580b2dd5 100644
+index c3bab27718d..f6eede56648 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -104,7 +104,7 @@ subdir('loader')
+@@ -110,7 +110,7 @@ subdir('loader')
  if with_platform_haiku
    subdir('hgl')
  endif
@@ -136,5 +140,5 @@ index d96c754a63d..a92580b2dd5 100644
  endif
  if with_gbm
 -- 
-2.17.1
+2.25.1