gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/cogl: Add patch to build with mesa-19.3

Browse Source 
Closes: https://bugs.gentoo.org/692212
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner
2019-11-23 13:14:45 -05:00
parent 26cca8c1e7
commit 95cabb346a
3 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media-libs/cogl/cogl-1.22.2.ebuild
View File

@@ -3,6 +3,7 @@
EAPI=6
GNOME2_EAUTORECONF="yes"
inherit gnome2 multilib
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
@@ -58,6 +59,10 @@ DEPEND="${COMMON_DEPEND}
# For some reason GL3 conformance test all fails again...
RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-eglmesaext-include.patch
)
src_prepare() {
# Do not build examples
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \

5
media-libs/cogl/cogl-1.22.4.ebuild
View File

@@ -3,6 +3,7 @@
EAPI=6
GNOME2_EAUTORECONF="yes"
inherit gnome2 multilib
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
@@ -58,6 +59,10 @@ DEPEND="${COMMON_DEPEND}
# For some reason GL3 conformance test all fails again...
RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-eglmesaext-include.patch
)
src_prepare() {
# Do not build examples
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \

60
media-libs/cogl/files/cogl-eglmesaext-include.patch Normal file
View File

@@ -0,0 +1,60 @@
From 9c4764224aded552fb855b1c2b85b26d2b894adf Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <alexander@tsoy.me>
Date: Tue, 29 Oct 2019 18:17:51 +0300
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
---
configure.ac | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index da188edd..b0b0c94d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -670,10 +670,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.
#
@@ -1178,6 +1183,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"],
@@ -1188,7 +1199,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.22.0