Hello Max, On Sat, Jun 27, 2020 at 1:35 PM Max Krummenacher <[email protected]> wrote: > > 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. > > Signed-off-by: Max Krummenacher <[email protected]> > --- > ...figure.ac-don-t-require-eglmesaext.h.patch | 77 +++++++++++++++++++ > meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb | 1 + > 2 files changed, 78 insertions(+) > create mode 100644 > meta/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch > > 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 @@ > +From ca94946110f4aaeeb0cbc75e11a619b21f295056 Mon Sep 17 00:00:00 2001 > +From: Max Krummenacher <[email protected]> > +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 <[email protected]> > + > +Upstream-Status: Submitted > [https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/28] > +Signed-off-by: Max Krummenacher <[email protected]> > +--- > + 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 > + > 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 @@ > require cogl-1.0.inc > > +SRC_URI += "file://0001-configure.ac-don-t-require-eglmesaext.h.patch" > SRC_URI[archive.sha256sum] = > "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759" > > LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" > -- > 2.20.1 >
This patch fails to build with following errors in do_configure: | checking for wayland-egl >= 1.0.0 wayland-client >= 1.0.0... yes | checking EGL/egl.h usability... no | checking EGL/egl.h presence... no | checking for EGL/egl.h... no | configure: error: Unable to locate required EGL headers | WARNING: exit code 1 from a shell command. > -- Regards, Andrey.
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140042): https://lists.openembedded.org/g/openembedded-core/message/140042 Mute This Topic: https://lists.openembedded.org/mt/75150547/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
