Commit e6fe0c2c authored by Eric Engestrom's avatar Eric Engestrom Committed by Juan Suárez Romero

gl: drop incorrect pkg-config file for glvnd

Akin to 1a25980c ("egl: drop incorrect pkg-config file for
glvnd") and b01524ff ("meson: don't build libGLES*.so with
GLVND") , removes a pkg-config file that shouldn't have been there in
the first place, but was needed because of that GLVND bug.

Now that the glvnd bug has been fixed, it was apparent that this gl.pc
pkg-config file was forgotten to be removed, so let's do just that :)
Suggested-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
(cherry picked from commit a1de3011)
parent 4f814b9e
......@@ -97,22 +97,12 @@ endif
# This must be after at least mesa, glx, and gallium, since libgl will be
# defined in one of those subdirs depending on the glx provider.
if with_glx != 'disabled'
# If using glvnd the pkg-config header should not point to GL_mesa, it should
# point to GL. 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
_gl = '-L${libdir} -lGL'
else
_gl = libgl
endif
if with_glx != 'disabled' and not with_glvnd
pkg.generate(
name : 'gl',
description : 'Mesa OpenGL Library',
version : meson.project_version(),
libraries : _gl,
libraries : libgl,
libraries_private : gl_priv_libs,
requires_private : gl_priv_reqs,
variables : ['glx_tls=yes'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment