Mesa (staging/19.2): meson: skip installation of GLVND-provided headers
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Oct 11 18:23:33 UTC 2019
Module: Mesa
Branch: staging/19.2
Commit: 8355658fa857536d948773b361c5ede770e637a3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8355658fa857536d948773b361c5ede770e637a3
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Mon Sep 30 14:08:29 2019 +0100
meson: skip installation of GLVND-provided headers
Fixes: 93df862b6affb6b8507e ("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1846
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit 34ba363ab0e231c2842c4a045dc51c5b1cd33401)
---
include/meson.build | 110 ++++++++++++++++++++++++++--------------------------
1 file changed, 56 insertions(+), 54 deletions(-)
diff --git a/include/meson.build b/include/meson.build
index 149b122236b..a64d9373a92 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -22,60 +22,62 @@ inc_include = include_directories('.')
inc_d3d9 = include_directories('D3D9')
inc_haikugl = include_directories('HaikuGL')
-if with_gles1 or with_gles2 or with_opengl or with_egl
- install_headers('KHR/khrplatform.h', subdir : 'KHR')
-endif
-
-if with_gles1
- install_headers(
- 'GLES/egl.h',
- 'GLES/gl.h',
- 'GLES/glext.h',
- 'GLES/glplatform.h',
- subdir : 'GLES',
- )
-endif
-
-if with_gles2
- install_headers(
- 'GLES2/gl2.h',
- 'GLES2/gl2ext.h',
- 'GLES2/gl2platform.h',
- subdir : 'GLES2',
- )
- install_headers(
- 'GLES3/gl3.h',
- 'GLES3/gl31.h',
- 'GLES3/gl32.h',
- 'GLES3/gl3ext.h',
- 'GLES3/gl3platform.h',
- subdir : 'GLES3',
- )
-endif
-
-if with_opengl
- install_headers(
- 'GL/gl.h',
- 'GL/glcorearb.h',
- 'GL/glext.h',
- subdir : 'GL',
- )
-endif
-
-if with_glx != 'disabled'
- install_headers(
- 'GL/glx.h',
- 'GL/glxext.h',
- subdir : 'GL')
-endif
-
-if with_egl
- install_headers(
- 'EGL/egl.h',
- 'EGL/eglext.h',
- 'EGL/eglplatform.h',
- subdir : 'EGL',
- )
+if not glvnd_has_headers_and_pc_files
+ if with_gles1 or with_gles2 or with_opengl or with_egl
+ install_headers('KHR/khrplatform.h', subdir : 'KHR')
+ endif
+
+ if with_gles1
+ install_headers(
+ 'GLES/egl.h',
+ 'GLES/gl.h',
+ 'GLES/glext.h',
+ 'GLES/glplatform.h',
+ subdir : 'GLES',
+ )
+ endif
+
+ if with_gles2
+ install_headers(
+ 'GLES2/gl2.h',
+ 'GLES2/gl2ext.h',
+ 'GLES2/gl2platform.h',
+ subdir : 'GLES2',
+ )
+ install_headers(
+ 'GLES3/gl3.h',
+ 'GLES3/gl31.h',
+ 'GLES3/gl32.h',
+ 'GLES3/gl3ext.h',
+ 'GLES3/gl3platform.h',
+ subdir : 'GLES3',
+ )
+ endif
+
+ if with_opengl
+ install_headers(
+ 'GL/gl.h',
+ 'GL/glcorearb.h',
+ 'GL/glext.h',
+ subdir : 'GL',
+ )
+ endif
+
+ if with_glx != 'disabled'
+ install_headers(
+ 'GL/glx.h',
+ 'GL/glxext.h',
+ subdir : 'GL')
+ endif
+
+ if with_egl
+ install_headers(
+ 'EGL/egl.h',
+ 'EGL/eglext.h',
+ 'EGL/eglplatform.h',
+ subdir : 'EGL',
+ )
+ endif
endif
# Non-upstream headers
More information about the mesa-commit
mailing list