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 45274138334 for ; Mon, 23 Jul 2018 22:30:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFE3DE0976; Mon, 23 Jul 2018 22:30:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BCCDFE0976 for ; Mon, 23 Jul 2018 22:30:25 +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 4F44833BEE0 for ; Mon, 23 Jul 2018 22:30:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81D6538B for ; Mon, 23 Jul 2018 22:30:19 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1532384627.7f268cbd114024d9dad9cdfe241e83a9f1716b82.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 7f268cbd114024d9dad9cdfe241e83a9f1716b82 X-VCS-Branch: master Date: Mon, 23 Jul 2018 22:30:19 +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-Archives-Salt: 1b216f42-4353-412f-b138-7743c96de431 X-Archives-Hash: bed721870537bff81846c56d8d109fdc commit: 7f268cbd114024d9dad9cdfe241e83a9f1716b82 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Jul 22 13:09:10 2018 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Jul 23 22:23:47 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f268cbd net-libs/webkit-gtk: simplify opengl vs gles2 handling, fix gst gles2 deps webkit-gtk itself does not support both full OpenGL and GLESv2 at once yet. ENABLE_OPENGL enables OpenGL in general, and if enabled then ENABLE_GLES2 determines which API is used - if enabled, then gles2, otherwise full GL. Simplify REQUIRED_USE handling to enforce the opengl/gles2 conflict separately, and have the webgl case just want either, to be future-proof and easier to read independently. WebGL should just always be enabled when either GL API is enabled, but keeping it under USE flag for the time being, until an even deeper GL/GStreamer webkitgtk cmake review, due to the webgl? ( gstreamer ) REQUIRED_USE still present. For now just (probably) properly depend on gstreamer gles2 support for USE="gles2 gstreamer" builds. Bug: https://bugs.gentoo.org/500150 Package-Manager: Portage-2.3.43, Repoman-2.3.10 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild index 189dd47e268..761afd90ed4 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild @@ -22,12 +22,11 @@ IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +intros # webgl needs gstreamer, bug #560612 REQUIRED_USE=" geolocation? ( introspection ) - gles2? ( egl ) + gles2? ( egl !opengl ) introspection? ( gstreamer ) nsplugin? ( X ) - webgl? ( ^^ ( gles2 opengl ) ) - !webgl? ( ?? ( gles2 opengl ) ) - webgl? ( gstreamer ) + webgl? ( gstreamer + || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X ) " @@ -70,7 +69,7 @@ RDEPEND=" gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 - >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) + >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) X? ( x11-libs/libX11