summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2020-06-27 13:34:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-28 08:36:00 +0100
commit24da33413aed264454d883146241ea96bd7e0438 (patch)
treeb40318617a2e0e506649118f7bcb4716138ef955
parented72ec35301036023ce2ee296317d79926c6f9fe (diff)
downloadpoky-24da33413aed264454d883146241ea96bd7e0438.tar.gz
cogl-1.0: : don't require eglmesaext.h
Starting with 1.22.8 cogl code unconditionally includes eglmesaext.h. Change configure.ac so that eglmesaext.h is only included if it actually exists. (From OE-Core rev: 9bfe2ab739d8987ac469924070a5526572ef1d82) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch77
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb1
2 files changed, 78 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch b/meta/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch
new file mode 100644
index 0000000000..16ab2d7797
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch
@@ -0,0 +1,77 @@
1From ca94946110f4aaeeb0cbc75e11a619b21f295056 Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Thu, 25 Jun 2020 11:27:40 +0000
4Subject: [PATCH] configure.ac: don't require eglmesaext.h
5
6E.g. the Vivante EGL implementation does not provide eglmesaext.h.
7
8The commit moves the check for header file existence outside of the
9check for existence of a egl packageconfig and makes the existence
10of eglmesaext.h optional.
11
12fixes commit fb1acfec ("Fix building against libglvnd-provided EGL headers")
13Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
14
15Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/28]
16Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
17---
18 configure.ac | 36 +++++++++++++++++-------------------
19 1 file changed, 17 insertions(+), 19 deletions(-)
20
21diff --git a/configure.ac b/configure.ac
22index 12798e9f..f7fa40e2 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -1212,22 +1212,6 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
26 PKG_CHECK_EXISTS([egl],
27 [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES egl"],
28 [
29- AC_CHECK_HEADERS(
30- [EGL/egl.h],
31- [],
32- [AC_MSG_ERROR([Unable to locate required EGL headers])])
33- AC_CHECK_HEADERS(
34- [EGL/eglext.h],
35- [],
36- [AC_MSG_ERROR([Unable to locate required EGL headers])],
37- [#include <EGL/egl.h>])
38- AC_CHECK_HEADERS(
39- [EGL/eglmesaext.h],
40- [],
41- [AC_MSG_ERROR([Unable to locate required EGL headers])],
42- [#include <EGL/egl.h>
43-#include <EGL/eglext.h>])
44-
45 AC_CHECK_LIB(EGL, [eglInitialize],
46 [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
47 [AC_MSG_ERROR([Unable to locate required EGL library])])
48@@ -1236,9 +1220,23 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
49 ]
50 )
51
52- COGL_EGL_INCLUDES="#include <EGL/egl.h>
53-#include <EGL/eglext.h>
54-#include <EGL/eglmesaext.h>"
55+ AC_CHECK_HEADERS(
56+ [EGL/egl.h],
57+ [COGL_EGL_INCLUDES="#include <EGL/egl.h>"],
58+ [AC_MSG_ERROR([Unable to locate required EGL headers])])
59+ AC_CHECK_HEADERS(
60+ [EGL/eglext.h],
61+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
62+#include <EGL/eglext.h>"],
63+ [AC_MSG_ERROR([Unable to locate required EGL headers])],
64+ [$COGL_EGL_INCLUDES])
65+ AC_CHECK_HEADERS(
66+ [EGL/eglmesaext.h],
67+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
68+#include <EGL/eglmesaext.h>"],
69+ [],
70+ [$COGL_EGL_INCLUDES])
71+
72 AC_SUBST([COGL_EGL_INCLUDES])
73 ])
74
75--
762.20.1
77
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb
index 78f6b0e7a3..b9446fab38 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb
@@ -1,5 +1,6 @@
1require cogl-1.0.inc 1require cogl-1.0.inc
2 2
3SRC_URI += "file://0001-configure.ac-don-t-require-eglmesaext.h.patch"
3SRC_URI[archive.sha256sum] = "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759" 4SRC_URI[archive.sha256sum] = "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759"
4 5
5LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" 6LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"