debian/changelog

 libglvnd (1.1.1-1) UNRELEASED; urgency=medium
 
   * New upstream release. (LP: #1816004)
+  * add-pkgconfig-support-for-libs.patch: Add missing pkgconfig files for
+    EGL, GL, GLX, GLESv1, GLESv2 and OpenGL. (Closes: #930514)
+  * control: Bump libglvnd-dev Breaks/Replaces for libgles2-mesa-dev,
+    glesv2.pc moved here.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 13 Mar 2019 20:05:49 +0200
 

debian/control

@@ -35,12 +35,12 @@ Breaks:
  libegl1-mesa-dev (<< 17.2.0~rc4-1),
  libgl1-mesa-dev (<< 17.2.0~rc4-1),
  libgles1-mesa-dev (<< 17.0.0~rc3-1),
- libgles2-mesa-dev (<< 17.2.0~rc4-1),
+ libgles2-mesa-dev (<< 19.1.0-1),
 Replaces:
  libegl1-mesa-dev (<< 17.2.0~rc4-1),
  libgl1-mesa-dev (<< 17.2.0~rc4-1),
  libgles1-mesa-dev (<< 17.0.0~rc3-1),
- libgles2-mesa-dev (<< 17.2.0~rc4-1),
+ libgles2-mesa-dev (<< 19.1.0-1),
 Multi-Arch: same
 Description: Vendor neutral GL dispatch library -- development files
  This is an implementation of the vendor-neutral dispatch layer for

debian/libglvnd-core-dev.install

 usr/include/glvnd/*.h
-usr/lib/*/pkgconfig/*.pc
+usr/lib/*/pkgconfig/libglvnd.pc

debian/libglvnd-dev.install

 usr/lib/*/*.so
+usr/lib/*/pkgconfig/egl.pc
+usr/lib/*/pkgconfig/gl.pc
+usr/lib/*/pkgconfig/glx.pc
+usr/lib/*/pkgconfig/glesv1_cm.pc
+usr/lib/*/pkgconfig/glesv2.pc
+usr/lib/*/pkgconfig/opengl.pc

debian/patches/add-pkgconfig-support-for-libs.patch

+https://github.com/NVIDIA/libglvnd/pull/86
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -308,11 +308,17 @@ AC_CONFIG_FILES([Makefile
+                  libglvnd.pc
+                  include/Makefile
+                  src/Makefile
++                 src/GL/gl.pc
+                  src/GL/Makefile
++                 src/OpenGL/opengl.pc
+                  src/OpenGL/Makefile
++                 src/GLESv1/glesv1_cm.pc
+                  src/GLESv1/Makefile
++                 src/GLESv2/glesv2.pc
+                  src/GLESv2/Makefile
++                 src/GLX/glx.pc
+                  src/GLX/Makefile
++                 src/EGL/egl.pc
+                  src/EGL/Makefile
+                  src/GLdispatch/Makefile
+                  src/GLdispatch/vnd-glapi/Makefile
+--- a/src/EGL/Makefile.am
++++ b/src/EGL/Makefile.am
+@@ -67,6 +67,9 @@ libEGL_la_LIBADD += $(UTIL_DIR)/libcJSON
+ libEGL_la_LIBADD += $(UTIL_DIR)/libwinsys_dispatch.la
+ libEGL_la_LIBADD += libEGL_dispatch_stubs.la
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = egl.pc
++
+ libEGL_la_LDFLAGS = -shared -Wl,-Bsymbolic -version-info 2:0:1 $(LINKER_FLAG_NO_UNDEFINED)
+ 
+ libEGL_la_SOURCES = \
+--- /dev/null
++++ b/src/EGL/egl.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: egl
++Description: EGL library and headers
++Version: 1.5
++Libs: -L${libdir} -lEGL
++Cflags: -I${includedir}
+--- a/src/GL/Makefile.am
++++ b/src/GL/Makefile.am
+@@ -70,3 +70,6 @@ libGL_la_LIBADD += ../GLdispatch/libGLdi
+ libGL_la_LIBADD += ../GLdispatch/vnd-glapi/libglapi_gl.la
+ libGL_la_LIBADD += ../util/libutils_misc.la
+ libGL_la_LIBADD += @LIB_DL@
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = gl.pc
+--- /dev/null
++++ b/src/GL/gl.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: gl
++Description: Legacy OpenGL and GLX library and headers
++Version: 1.2
++Libs: -L${libdir} -lGL
++Cflags: -I${includedir}
+--- a/src/GLESv1/Makefile.am
++++ b/src/GLESv1/Makefile.am
+@@ -38,3 +38,5 @@ libGLESv1_CM_la_LIBADD = \
+ 	../GLdispatch/vnd-glapi/libglapi_glesv1.la \
+ 	../util/libutils_misc.la
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = glesv1_cm.pc
+--- /dev/null
++++ b/src/GLESv1/glesv1_cm.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: glesv1_cm
++Description: OpenGL ES-CM v1 library and headers
++Version: 1.0
++Libs: -L${libdir} -lGLESv1_CM
++Cflags: -I${includedir}
+--- a/src/GLESv2/Makefile.am
++++ b/src/GLESv2/Makefile.am
+@@ -38,3 +38,5 @@ libGLESv2_la_LIBADD = \
+ 	../GLdispatch/vnd-glapi/libglapi_glesv2.la \
+ 	../util/libutils_misc.la
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = glesv2.pc
+--- /dev/null
++++ b/src/GLESv2/glesv2.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: gles2
++Description: OpenGL ES v2/v3 library and headers
++Version: 3.2
++Libs: -L${libdir} -lGLESv2
++Cflags: -I${includedir}
+--- /dev/null
++++ b/src/GLX/glx.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: glx
++Description: GLX library and headers
++Version: 1.4
++Libs: -L${libdir} -lGLX
++Cflags: -I${includedir}
+--- /dev/null
++++ b/src/OpenGL/opengl.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=@libdir@
++includedir=@includedir@
++
++Name: opengl
++Description: OpenGL (without GLX) headers and interface
++Version: 4.5
++Libs: -L${libdir} -lOpenGL
++Cflags: -I${includedir}
+--- a/src/GLX/Makefile.am
++++ b/src/GLX/Makefile.am
+@@ -69,3 +69,5 @@ libGLX_la_SOURCES = \
+ 	libglxmapping.c \
+ 	libglxproto.c
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = glx.pc
+--- a/src/OpenGL/Makefile.am
++++ b/src/OpenGL/Makefile.am
+@@ -47,3 +47,5 @@ libOpenGL_la_LIBADD = \
+ 	../GLdispatch/vnd-glapi/libglapi_opengl.la \
+ 	../util/libutils_misc.la
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = opengl.pc

debian/patches/series

-#placeholder
+add-pkgconfig-support-for-libs.patch