From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D822B138334 for ; Sat, 23 Nov 2019 19:45:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5AD5E0788; Sat, 23 Nov 2019 19:45:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3CC9E0788 for ; Sat, 23 Nov 2019 19:45:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FDCA34D288 for ; Sat, 23 Nov 2019 19:45:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE6088B9 for ; Sat, 23 Nov 2019 19:45:10 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1574538246.95cabb346af451e99b89c1d2dc728551855cf6af.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/, media-libs/cogl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/cogl/cogl-1.22.2.ebuild media-libs/cogl/cogl-1.22.4.ebuild media-libs/cogl/files/cogl-eglmesaext-include.patch X-VCS-Directories: media-libs/cogl/files/ media-libs/cogl/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 95cabb346af451e99b89c1d2dc728551855cf6af X-VCS-Branch: master Date: Sat, 23 Nov 2019 19:45:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f42b6237-0125-4fe0-8686-1247711e12f6 X-Archives-Hash: 43722ae06e5aabcba21e4e5806a9470c commit: 95cabb346af451e99b89c1d2dc728551855cf6af Author: Matt Turner gentoo org> AuthorDate: Sat Nov 23 18:14:45 2019 +0000 Commit: Matt Turner gentoo 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 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 +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 "], + [], + [$COGL_EGL_INCLUDES]) ++ AC_CHECK_HEADERS([EGL/eglmesaext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES ++#include "], ++ [], ++ [$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 ]) ++ AC_CHECK_HEADERS( ++ [EGL/eglmesaext.h], ++ [], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#include ++#include ]) + + 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 +-#include " ++#include ++#include " + AC_SUBST([COGL_EGL_INCLUDES]) + ]) + +-- +2.22.0 +