diff options
| author | Eric Engestrom <[email protected]> | 2019-07-04 14:48:43 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-07-20 00:07:06 +0100 |
| commit | 1a25980c469b38d2c6456344fe538ad1bcb47f63 (patch) | |
| tree | e6376d9f551fca67e8fb3598663170cf4b6b4288 /src/egl | |
| parent | e8febd6cba296ead8f94ae87e7d54a3bb7ca50b0 (diff) | |
egl: drop incorrect pkg-config file for glvnd
With b01524fff05eef66e8cd ("meson: don't build libGLES*.so with GLVND")
we dropped the incorrect pkg-config files for GLES*.
Since then, the glvnd issue of its missing files has become painfully
apparent, since it break the build for everyone using glvnd.
NVIDIA has had a fix for a few years now, but has yet to accept it:
https://github.com/NVIDIA/libglvnd/pull/86
Since the breakage is already there, let's clean up everything on our side
while we wait for NVIDIA to accept the fix.
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/meson.build | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build index d864c099efa..b433ccb7600 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -172,26 +172,18 @@ libegl = shared_library( version : egl_lib_version, ) -# If using glvnd the pkg-config header should not point to EGL_mesa, it should -# point to EGL. glvnd is only available on unix like platforms so adding -l -# should be safe here -# TODO: in the glvnd case glvnd itself should really be providing this. -if with_glvnd - _egl = '-L${libdir} -lEGL' -else - _egl = libegl +if not with_glvnd + pkg.generate( + name : 'egl', + description : 'Mesa EGL Library', + version : meson.project_version(), + libraries : libegl, + libraries_private: gl_priv_libs, + requires_private : gl_priv_reqs, + extra_cflags : gl_pkgconfig_c_flags, + ) endif -pkg.generate( - name : 'egl', - description : 'Mesa EGL Library', - version : meson.project_version(), - libraries : _egl, - libraries_private: gl_priv_libs, - requires_private : gl_priv_reqs, - extra_cflags : gl_pkgconfig_c_flags, -) - if with_tests and prog_nm.found() if with_glvnd egl_symbols = files('egl-glvnd-symbols.txt') |