commit: 95cabb346af451e99b89c1d2dc728551855cf6af Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Nov 23 18:14:45 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Nov 23 19:44:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cabb34
media-libs/cogl: Add patch to build with mesa-19.3 Closes: https://bugs.gentoo.org/692212 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/cogl/cogl-1.22.2.ebuild | 5 ++ media-libs/cogl/cogl-1.22.4.ebuild | 5 ++ .../cogl/files/cogl-eglmesaext-include.patch | 60 ++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild index c3702f70dec..eae9521a25c 100644 --- a/media-libs/cogl/cogl-1.22.2.ebuild +++ b/media-libs/cogl/cogl-1.22.2.ebuild @@ -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/" \ diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild index 3265c8399cc..f79e884927e 100644 --- a/media-libs/cogl/cogl-1.22.4.ebuild +++ b/media-libs/cogl/cogl-1.22.4.ebuild @@ -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/" \ diff --git a/media-libs/cogl/files/cogl-eglmesaext-include.patch b/media-libs/cogl/files/cogl-eglmesaext-include.patch new file mode 100644 index 00000000000..eff5c6841e1 --- /dev/null +++ b/media-libs/cogl/files/cogl-eglmesaext-include.patch @@ -0,0 +1,60 @@ +From 9c4764224aded552fb855b1c2b85b26d2b894adf Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <[email protected]> +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 +
