|
@@ -0,0 +1,77 @@
|
|
|
+From ca94946110f4aaeeb0cbc75e11a619b21f295056 Mon Sep 17 00:00:00 2001
|
|
|
+From: Max Krummenacher <max.krummenacher@toradex.com>
|
|
|
+Date: Thu, 25 Jun 2020 11:27:40 +0000
|
|
|
+Subject: [PATCH] configure.ac: don't require eglmesaext.h
|
|
|
+
|
|
|
+E.g. the Vivante EGL implementation does not provide eglmesaext.h.
|
|
|
+
|
|
|
+The commit moves the check for header file existence outside of the
|
|
|
+check for existence of a egl packageconfig and makes the existence
|
|
|
+of eglmesaext.h optional.
|
|
|
+
|
|
|
+fixes commit fb1acfec ("Fix building against libglvnd-provided EGL headers")
|
|
|
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
|
|
+
|
|
|
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/28]
|
|
|
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
|
|
+---
|
|
|
+ configure.ac | 36 +++++++++++++++++-------------------
|
|
|
+ 1 file changed, 17 insertions(+), 19 deletions(-)
|
|
|
+
|
|
|
+diff --git a/configure.ac b/configure.ac
|
|
|
+index 12798e9f..f7fa40e2 100644
|
|
|
+--- a/configure.ac
|
|
|
++++ b/configure.ac
|
|
|
+@@ -1212,22 +1212,6 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
|
|
|
+ PKG_CHECK_EXISTS([egl],
|
|
|
+ [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES egl"],
|
|
|
+ [
|
|
|
+- AC_CHECK_HEADERS(
|
|
|
+- [EGL/egl.h],
|
|
|
+- [],
|
|
|
+- [AC_MSG_ERROR([Unable to locate required EGL headers])])
|
|
|
+- AC_CHECK_HEADERS(
|
|
|
+- [EGL/eglext.h],
|
|
|
+- [],
|
|
|
+- [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"],
|
|
|
+ [AC_MSG_ERROR([Unable to locate required EGL library])])
|
|
|
+@@ -1236,9 +1220,23 @@ 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/eglmesaext.h>"
|
|
|
++ AC_CHECK_HEADERS(
|
|
|
++ [EGL/egl.h],
|
|
|
++ [COGL_EGL_INCLUDES="#include <EGL/egl.h>"],
|
|
|
++ [AC_MSG_ERROR([Unable to locate required EGL headers])])
|
|
|
++ AC_CHECK_HEADERS(
|
|
|
++ [EGL/eglext.h],
|
|
|
++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
|
|
|
++#include <EGL/eglext.h>"],
|
|
|
++ [AC_MSG_ERROR([Unable to locate required EGL headers])],
|
|
|
++ [$COGL_EGL_INCLUDES])
|
|
|
++ AC_CHECK_HEADERS(
|
|
|
++ [EGL/eglmesaext.h],
|
|
|
++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
|
|
|
++#include <EGL/eglmesaext.h>"],
|
|
|
++ [],
|
|
|
++ [$COGL_EGL_INCLUDES])
|
|
|
++
|
|
|
+ AC_SUBST([COGL_EGL_INCLUDES])
|
|
|
+ ])
|
|
|
+
|
|
|
+--
|
|
|
+2.20.1
|
|
|
+
|