gentoo resync : 15.12.2019

4 files changed, 75 insertions, 4 deletions

diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index e6b5ebb048dc..1c48c5cd786a 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,5 +1,6 @@
+AUX cogl-eglmesaext-include.patch 2204 BLAKE2B 307a473a606129fe7e08e65915dbe985d3765c2745ec444b41592f8c36ab5b6ad0d43bbc35a93f01666d8cff81111e0c211bddfbf5d89f48591c8bf5377cb471 SHA512 41e475d73e12e4ab517c49ae1a70d1dd71e9f8a618eb28cd7b81430bf3acec84bbdf8a31ec4e02fd87734fe402e523cda5c14c4a4c5d63928b9de930bcf23e10
 DIST cogl-1.22.2.tar.xz 1682360 BLAKE2B f5a1543266bd87c6835322d5dbf501ec4f9fec52cc18d73d140323fef2f1b6b2293b5998bc8914b0a8cb514e7fefe5a1500793e1c7d8b5e0a4365fe8ef13233f SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3
 DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
-EBUILD cogl-1.22.2.ebuild 3296 BLAKE2B 4d54e1b23836eabe6481d04a0e5f72a4b5a4b254b0b20a3a2bcdaaca1f07ba5a5f3ac166450cad816a5f8f39dc24b60b2376cb35baef2fd76b52969a3b8797b3 SHA512 0d4233f5255bc121afcc88911f3ccde053781c5e7af11991b1b0203c634a6ee3f6d11ece85961354fb2c60ff9ed70f9ff65c5f7d5c6058094e2786403a4bcf2c
-EBUILD cogl-1.22.4.ebuild 3301 BLAKE2B 554e34ce7e632da913dde9f6348a4466d7d048fc0278e472bbe35c63409a79116ae67ca44b04049e1865a2b5729b335a774e81a57961b4b304e1831bc9d9b50a SHA512 db77352038331a943628dba9d9ff6d5d83c2d3d48962405d4a8dd3205bbd4a8b6440fb3d1819528aef856c689d9d31a96792c124676ecd707efe2f88ba226daf
+EBUILD cogl-1.22.2.ebuild 3380 BLAKE2B 3f0edc07cb21afd76037f3d6450ab6076b304805c6e4bd7a33dd338860271eafe190ecf4f72e35993a2d5f059b5aeb8981dd3a14c1ebbe74b57dca63394aa4b5 SHA512 1cf4cf32c2f628ef48ded55dbf79e8137d83ccad6a60de82adb735980055d1533bd76c185a32904910b27a731d6f83391422847034b8b02b811c3713f2aa0282
+EBUILD cogl-1.22.4.ebuild 3384 BLAKE2B e7ec47ce429bb379fbd09bc914f1084e9005675c39d08266e4617704b56cc429c2feaa9fdaf174943dbbbe3961b738a10ec627c97879191d7c43dee8bb4d21ff SHA512 1ea40945fce8368d3f265b10c6dd57ebe29301948318eab0d9b283fdcbcf51df59f8d1dad4c198e6b7eb85a2087ade02817731aeb4bdf5fecdf5a85b1f021b24
 MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
index c3702f70decd..eae9521a25cd 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 12bd445b80ff..05c334364057 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"
@@ -17,7 +18,7 @@ REQUIRED_USE="
 	wayland? ( gles2 )
 	|| ( gles2 opengl )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
@@ -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/" \
@@ -114,5 +119,5 @@ src_install() {
 	gnome2_src_install
 
 	# Remove silly examples-data directory
-	rm -rv "${ED}/usr/share/cogl/examples-data/" || die
+	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
 }
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 000000000000..eff5c6841e1b
--- /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 <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
+