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 10F1A138334 for ; Mon, 23 Jul 2018 22:30:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D01FE0960; Mon, 23 Jul 2018 22:30:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E439FE0960 for ; Mon, 23 Jul 2018 22:30:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 797DE33BEDE for ; Mon, 23 Jul 2018 22:30:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B3BF389 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: <1532384623.73d95b14d48bc96582f3dca2029ffdf790d1aafd.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: 73d95b14d48bc96582f3dca2029ffdf790d1aafd 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: 099e668d-d1ab-492c-b144-416b58ae3507 X-Archives-Hash: 01ca3f8d9e78f7418da4c7a31af67593 commit: 73d95b14d48bc96582f3dca2029ffdf790d1aafd Author: Mart Raudsepp gentoo org> AuthorDate: Mon Jul 23 09:36:00 2018 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Jul 23 22:23:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d95b14 net-libs/webkit-gtk-2.20.3: disable experimental accelerated 2D canvas ACCELERATED_2D_CANVAS is considered experimental by upstream. I'm not sure what the justification was for enabling it with USE="webgl opengl" for us. The only reason this code isn't removed fully from upstream is because it _MIGHT_ be useful for some embedded use cases, yet it doesn't work with GLES2 yet, only desktop opengl. Additionally, for us this is causing additional cairo[opengl] dependency that can't be avoided for just non-experimental WebGL support via desktop GL as it was setup before in ebuild. No-one but Gentoo is building with this experimental option (not even upstream developers), and any issues about it won't really be cared about. Disable it and drop the cairo[opengl] dependency. https://lists.webkit.org/pipermail/webkit-gtk/2017-March/002969.html https://lists.webkit.org/pipermail/webkit-gtk/2017-April/003004.html If this is ever added back for any reason, make sure cairo[opengl] isn't depended on when not necessary (when accelerated 2d canvas is disabled, e.g. previously USE="opengl gles2" pulled in cairo[opengl] still, albeit that combination was not allowed previously, but a future webkit-gtk upstream version may support them together) and review if cairo-glesv2 is supported (and so it'd be supported with USE=gles2 too, unlike now). Bug: https://bugs.gentoo.org/581248 Closes: https://bugs.gentoo.org/643726 Package-Manager: Portage-2.3.43, Repoman-2.3.10 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 16 ++-------------- 1 file changed, 2 insertions(+), 14 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 56fbc1c1f50..af0b97e336e 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild @@ -41,7 +41,7 @@ RESTRICT="test" # Various compile-time optionals for gtk+-3.22.0 - ensure it # Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) RDEPEND=" - >=x11-libs/cairo-1.10.2:= + >=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= @@ -73,7 +73,6 @@ RDEPEND=" >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( - x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -85,10 +84,8 @@ RDEPEND=" egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl - x11-libs/cairo[opengl] ) + opengl? ( virtual/opengl ) webgl? ( - x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) " @@ -215,14 +212,6 @@ src_configure() { opengl_enabled=OFF fi - # support for webgl (aka 2d-canvas accelerating) - local canvas_enabled - if use webgl && ! use gles2 ; then - canvas_enabled=ON - else - canvas_enabled=OFF - fi - local mycmakeargs=( -DENABLE_QUARTZ_TARGET=$(usex aqua) -DENABLE_API_TESTS=$(usex test) @@ -245,7 +234,6 @@ src_configure() { $(cmake-utils_use_find_package opengl OpenGL) -DENABLE_X11_TARGET=$(usex X) -DENABLE_OPENGL=${opengl_enabled} - -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled} -DCMAKE_BUILD_TYPE=Release -DPORT=GTK ${ruby_interpreter}