[gentoo-commits] dev/leio:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     7bb3e5da6637f6ba2b36b86dc672cb69f625106f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 25 16:44:56 2015 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 25 16:45:13 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=7bb3e5da

webkit-gtk: Fix rpi egl/gles2 flag appending logic

It checks for egl libraries with USE=egl too in configure, not just when
USE=webgl is given. As they are force coupled with rpi, append the flags
when either egl or gles2 USE flags are given (though REQUIRED_USE mostly
takes care of it too, iirc).

 net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
index 3a549dc..34fdf6e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
@@ -216,9 +216,9 @@ src_configure() {
 	# Arches without JIT support also need this to really disable it in all places
 	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
 
-	if use webgl; then
-		use rpi && append-cppflags $(pkg-config --cflags egl glesv2)
-		use rpi && append-ldflags $(pkg-config --libs egl glesv2)
+	if use rpi; then
+		(use egl || use gles2) && append-cppflags $(pkg-config --cflags egl glesv2)
+		(use egl || use gles2) && append-ldflags $(pkg-config --libs egl glesv2)
 	fi
 
 	# It doesn't compile on alpha without this in LDFLAGS, bug #???