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 D395D138334 for ; Fri, 3 Jan 2020 22:50:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 218DBE0954; Fri, 3 Jan 2020 22:50:23 +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 EB01BE0954 for ; Fri, 3 Jan 2020 22:50:22 +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 D106234DE30 for ; Fri, 3 Jan 2020 22:50:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D6DC3E for ; Fri, 3 Jan 2020 22:50:13 +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: <1578091694.3ba0cdea3eae7b69ade6cdc94066754d562e5785.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.26.2.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 3ba0cdea3eae7b69ade6cdc94066754d562e5785 X-VCS-Branch: master Date: Fri, 3 Jan 2020 22:50:13 +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: 81692e3f-839f-482f-b77b-ee3e4bc3d330 X-Archives-Hash: b3941350db2c303bbe4cfdb506bb7d5a commit: 3ba0cdea3eae7b69ade6cdc94066754d562e5785 Author: Mart Raudsepp gentoo org> AuthorDate: Fri Jan 3 22:39:45 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Fri Jan 3 22:48:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba0cdea net-libs/webkit-gtk: Unconditionally build WebGL with enabled OpenGL Building with ENABLE_GL but without WEBGL is unsupported upstream and has no real benefits. The WebGL support can be disabled at runtime, if desired. Therefore tie the choice of WebGL support to having enabled GL support (full opengl or gles2), matching what upstream does if an explicit ENABLE_WEBGL _private_ configuration value isn't given. We keep it as a separately passed arg for now just for the sake of being explicit. WebGL has been fine without gstreamer for a while now - that seems to have been a temporary bug in the ancient 2.10 series - so all this does not mean that gstreamer is required with GL and the REQUIRED_USE that was there is dropped (not only due to IUSE=webgl going away - had it stayed, the restriction was wrong with USE=webgl being there too). It should also be fine without libXcomposite and libXdamage on wayland-only builds, so those deps are simply dropped (they are still there for USE=X). This may have been a reason some may have wanted to disable WebGL for wayland-only builds, but it was probably legacy wrong deps. Update a comment about WebRTC (upstream is using libwebrtc instead of OpenWebRTC right now, but isn't a supported build option out of tarballs, plus it may end up using gstreamer instead before it becomes non-experimental). Also remove outdated comment about FTL_JIT (it doesn't need llvm anymore and we are letting it be handled automatically by upstream cmake per-architecture conditionals). Drop -fno-strict-aliasing build flags forcing - upstream build system is supposed to take care of it these days. As I confirmed I still get it in the compiler calls, this change does not necessitate a revbump either (the rest are --changed-use territory). Closes: https://bugs.gentoo.org/704538 Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild index b743a3359c9..24b67060587 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild @@ -18,15 +18,12 @@ LICENSE="LGPL-2+ BSD" SLOT="4/37" # soname version of libwebkit2gtk-4.0 KEYWORDS="amd64" -IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +webgl +X" +IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X" -# webgl needs gstreamer, bug #560612 # gstreamer with opengl/gles2 needs egl REQUIRED_USE=" gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) - webgl? ( gstreamer - || ( gles2-only opengl ) ) wayland? ( egl ) || ( aqua wayland X ) " @@ -38,7 +35,7 @@ RESTRICT="test" # Aqua support in gtk3 is untested # Dependencies found at Source/cmake/OptionsGTK.cmake # 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) +# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26 # >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) wpe_depend=" >=gui-libs/libwpe-1.3.0:1.0 @@ -93,9 +90,6 @@ RDEPEND=" opengl? ( ${wpe_depend} ) gles2-only? ( ${wpe_depend} ) ) - webgl? ( - x11-libs/libXcomposite - x11-libs/libXdamage ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 @@ -205,9 +199,6 @@ src_configure() { # append-ldflags "-Wl,--reduce-memory-overheads" # fi - # Multiple rendering bugs on youtube, github, etc without this, bug #547224 - append-flags $(test-flags -fno-strict-aliasing) - # Ruby situation is a bit complicated. See bug 513888 local rubyimpl local ruby_interpreter="" @@ -223,8 +214,6 @@ src_configure() { # TODO: Check Web Audio support # should somehow let user select between them? # - # FTL_JIT requires llvm - # # opengl needs to be explicetly handled, bug #576634 local use_wpe_renderer=OFF @@ -254,11 +243,11 @@ src_configure() { -DENABLE_SPELLCHECK=$(usex spell) -DENABLE_WAYLAND_TARGET=$(usex wayland) -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland - -DENABLE_WEBGL=$(usex webgl) $(cmake-utils_use_find_package egl EGL) $(cmake-utils_use_find_package opengl OpenGL) -DENABLE_X11_TARGET=$(usex X) -DENABLE_OPENGL=${opengl_enabled} + -DENABLE_WEBGL=${opengl_enabled} -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that -DCMAKE_BUILD_TYPE=Release