mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-02 17:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

cogl-1.0: : don't require eglmesaext.h

Browse Source 
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>
This commit is contained in:
Max Krummenacher
2020-06-27 13:34:17 +02:00
committed by Richard Purdie
parent ed72ec3530
commit 24da33413a
2 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
meta/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch Normal file
View File

@@ -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

1
meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb
View File

@@ -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"