Mesa (staging/19.1): gl: drop incorrect pkg-config file for glvnd

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 02e0fa4cd7dc7608aa6256051a8c15d579e6a658
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=02e0fa4cd7dc7608aa6256051a8c15d579e6a658

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Wed Sep 18 21:48:49 2019 +0100

gl: drop incorrect pkg-config file for glvnd

Akin to 1a25980c469b38d2c645 ("egl: drop incorrect pkg-config file for
glvnd") and b01524fff05eef66e8cd ("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 <mattst88 at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit a1de3011f380b6ffd5583708b58e3f86d8d45ea9)

---

 src/meson.build | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 6d04b5fc3b2..39b7d044e5c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -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'],