[gnome-build-meta/abderrahim/3.37.2] sdk/cogl.bst: add patch to build against libglvnd-provided headers

[Abderrahim Kitouni <akitouni src gnome org>]

commit 668fac780eb56f91f918ab5a434ffa00ee5111c4
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon Jun 1 05:09:11 2020 +0100

    sdk/cogl.bst: add patch to build against libglvnd-provided headers

 elements/sdk/cogl.bst         |  2 ++
 files/cogl/libglvnd-egl.patch | 63 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
---
diff --git a/elements/sdk/cogl.bst b/elements/sdk/cogl.bst
index 6b332e0a..04633a13 100644
--- a/elements/sdk/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -2,6 +2,8 @@ kind: autotools
 sources:
 - kind: tar
   url: gnome_downloads:cogl/1.22/cogl-1.22.6.tar.xz
+- kind: patch
+  path: files/cogl/libglvnd-egl.patch
 build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/files/cogl/libglvnd-egl.patch b/files/cogl/libglvnd-egl.patch
new file mode 100644
index 00000000..460f38ee
--- /dev/null
+++ b/files/cogl/libglvnd-egl.patch
@@ -0,0 +1,63 @@
+From fb1acfecad5f3e9c81f0887e892be6b9c7c5bc47 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander tsoy me>
+Date: Tue, 29 Oct 2019 15:17:51 +0000
+Subject: [PATCH] Fix building against libglvnd-provided EGL headers
+
+Add missing EGL/eglmesaext.h include. When building against mesa-provided
+headers, this header is included indirectly via EGL/eglext.h.
+
+Also fix typo COGL_EGL_INCLUDE -> COGL_EGL_INCLUDES
+
+
+(cherry picked from commit 9c4764224aded552fb855b1c2b85b26d2b894adf)
+---
+ configure.ac | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a9a81c9d..1f0c6060 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -685,10 +685,15 @@ AS_IF([test "x$enable_gles1" = "xyes"],
+             AC_SUBST([COGL_EGL_INCLUDES])
+ 
+             AC_CHECK_HEADERS([EGL/eglext.h],
+-                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
++                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
+ #include <EGL/eglext.h>"],
+                              [],
+                              [$COGL_EGL_INCLUDES])
++            AC_CHECK_HEADERS([EGL/eglmesaext.h],
++                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
++#include <EGL/eglmesaext.h>"],
++                             [],
++                             [$COGL_EGL_INCLUDES])
+ 
+             # Check for a GLES 1.x Common Profile library with/without EGL.
+             #
+@@ -1216,6 +1221,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+               [],
+               [AC_MSG_ERROR([Unable to locate required EGL headers])],
+               [#include <EGL/egl.h>])
++            AC_CHECK_HEADERS(
++              [EGL/eglmesaext.h],
++              [],
++              [AC_MSG_ERROR([Unable to locate required EGL headers])],
++              [#include <EGL/egl.h>
++#include <EGL/eglext.h>])
+ 
+             AC_CHECK_LIB(EGL, [eglInitialize],
+               [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
+@@ -1226,7 +1237,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+           )
+ 
+         COGL_EGL_INCLUDES="#include <EGL/egl.h>
+-#include <EGL/eglext.h>"
++#include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>"
+         AC_SUBST([COGL_EGL_INCLUDES])
+       ])
+ 
+-- 
+2.26.2
+