diff options
Diffstat (limited to 'net-libs/webkit-gtk')
| -rw-r--r-- | net-libs/webkit-gtk/Manifest | 7 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch | 55 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild (renamed from net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild) | 124 |
4 files changed, 52 insertions, 136 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 5fe9028404a0..b5a17f79ef0b 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,9 +1,8 @@ -AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd AUX 2.34.3-jumbo-fix.patch 2430 BLAKE2B 0896f652262284cee74bec5f84f9bf8a88884f8c4182cbbc72dc59de5778856807772ecc92b9eb75c40eb021b0732ef81435e8894b46c8c10d833474e8c077c6 SHA512 c131daff77815eda541a376dc8904cffe7a75d9eb00fdf07ae872072aaa09493c2d01ae94122a0e6f43bdd8c8ba9aceb01821fb56b803c1b5f894d0e08abad53 AUX 2.34.3-non-jumbo-fix.patch 1056 BLAKE2B 4d229c01fbfae518725bb802c0fd907a1dc8bd4edd41be2b48075471f31ec84b6f9bae1b97294f46a42ba77a081e3705be3ad49177de28791a495f19ddb4f51e SHA512 1ace5a3c1e775f258c67c59987a0c84ebc7cadd007cc0b79b282712b354cdaf9eb4dd6ef75b85b234ad3b16079ac8dbf2890921165854fc2da51f79cbd5f0e79 AUX 2.34.3-opengl-without-X-fixes.patch 1436 BLAKE2B 231cdc9a428342d7fe98a1c1fb230b345f29b6a2d45da02cfa674dae1ceffbbcf5d62a77e903f690b59eb49ad7a3e50dffc190ea57bfa953f10fccfeb6dd4dfd SHA512 1af17f79d2a60cdd5337ca5a571787fb2cc1abc7d3f392b6640edc88856e2f8fc3e77625fdfd600d9ba9376a18ec379151d064d5f7ad1b2bfed0db2e0330e2ee -DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc -EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8 -EBUILD webkit-gtk-2.34.3.ebuild 8340 BLAKE2B 20de943304b61764da5a55212e24fc912bf7cf532ca3b85c42fca83c9632005d5f76b9c7924838c8b709648b504b2f098b2e99b58e6f8b7543294b4b209227ab SHA512 59ce1fc154a8c29f00e2c4f63bb4d4efb8a96e4956095e32ace53ece576dbac19ff0033911a32d5166b11caa98ba67ea8d4266b1790e3cb2dcf4c25517e91bc1 +DIST webkitgtk-2.34.4.tar.xz 24388604 BLAKE2B ba483a2457b25ff33d0ffb85ec7fc681390089c69c774d91821a9f23683a473ba86696bf393ba3368058227f4f9c95c84cbd3156f13ddd8331e427ecd13b84a3 SHA512 1a511ac6cb83cb602ecd8a56b3f6d00668de7fca74fcd5c6ce09e36af38b41742edc0bf572780867376aa27dd67d3aa451155f71d04bcdd3cba02c1f4f014df7 +EBUILD webkit-gtk-2.34.3.ebuild 8339 BLAKE2B 5a7b27e1a34844b1a46f0abd1803bffc1b5be1131ab8fd294e9e557495c42fd5c7d7d7d901a56df7705424d47a216488129ed2c5d8aa881699e6f471055b9235 SHA512 59a32b79bd5b2f6ab1e029e31ade9428e9103435f952dcfefffa24d8ea5ee4a6ca3343a48482c457656ce96e5ce69ce3550c34997e9317e8811996ed9b80d50d +EBUILD webkit-gtk-2.34.4.ebuild 8343 BLAKE2B 0ddd8a20f2c1afba0b94fdf03dcc9887407bb754fc38b42f084a365405e965e59f7ba7a4cc83945ab63bff16a56cfef88616b32d2a06a4029f9f5e92ef877d0f SHA512 9c49d10b235e7aff352035df3b3b455284aab0085e1699075562734df2222d58559ac15c8738715ee39361e63877b07d102194417e8f2735ba97cb8538df7f7d MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch deleted file mode 100644 index 7feb2fac42c3..000000000000 --- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://bugs.webkit.org/show_bug.cgi?id=208907 - -From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sat, 9 May 2020 23:11:52 +0300 -Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix - some build configurations - ---- - Source/WebCore/platform/graphics/GLContext.cpp | 5 ++++- - Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp -index b217988b990..1ba0eb8a482 100644 ---- a/Source/WebCore/platform/graphics/GLContext.cpp -+++ b/Source/WebCore/platform/graphics/GLContext.cpp -@@ -28,6 +28,9 @@ - - #if USE(GLX) - #include "GLContextGLX.h" -+#endif -+ -+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) - #include "OpenGLShims.h" - #endif - -@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext() - - static bool initializeOpenGLShimsIfNeeded() - { --#if USE(OPENGL_ES) || USE(LIBEPOXY) -+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE) - return true; - #else - static bool initialized = false; -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -index 3515be452b2..82cce70f14b 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp -@@ -64,7 +64,10 @@ - - #if USE(GLX) - #include <GL/glx.h> --#include <WebCore/OpenGLShims.h> -+#endif -+ -+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE) -+#include "WebCore/OpenGLShims.h" - #endif - - #if USE(GSTREAMER) --- -2.20.1 - diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild index a6cb56d76a50..940e11a2d115 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" LICENSE="LGPL-2+ BSD" SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X" diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild index 50c1d19b401f..3d7f52870d16 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,14 +14,14 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" LICENSE="LGPL-2+ BSD" SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X" +IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X" # gstreamer with opengl/gles2 needs egl REQUIRED_USE=" - gles2-only? ( egl !opengl ) - gstreamer? ( opengl? ( egl ) ) + gles2-only? ( egl ) + gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X ) " @@ -35,10 +35,6 @@ RESTRICT="test" # Various compile-time optionals for gtk+-3.22.0 - ensure it # Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30 # >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -wpe_depend=" - >=gui-libs/libwpe-1.5.0:1.0 - >=gui-libs/wpebackend-fdo-1.7.0:1.0 -" # TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix RDEPEND=" >=x11-libs/cairo-1.16.0:=[X?] @@ -47,7 +43,7 @@ RDEPEND=" >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-60.2:= + >=dev-libs/icu-61.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 @@ -66,8 +62,9 @@ RDEPEND=" spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] + >=media-libs/gst-plugins-base-1.14:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) + !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) @@ -81,15 +78,17 @@ RDEPEND=" libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) + avif? ( >=media-libs/libavif-0.9.0:= ) + lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl ) + !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 - opengl? ( ${wpe_depend} ) - gles2-only? ( ${wpe_depend} ) + >=gui-libs/libwpe-1.5.0:1.0 + >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( @@ -101,7 +100,6 @@ RDEPEND=" systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) " -unset wpe_depend DEPEND="${RDEPEND}" # paxctl needed for bug #407085 # Need real bison, not yacc @@ -148,16 +146,6 @@ pkg_pretend() { die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" fi fi - - if ! use opengl && ! use gles2-only; then - ewarn - ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely." - ewarn "This is an unsupported configuration meant for very specific embedded" - ewarn "use cases, where there truly is no GL possible (and even that use case" - ewarn "is very unlikely to come by). If you have GL (even software-only), you" - ewarn "really really should be enabling OpenGL!" - ewarn - fi } pkg_setup() { @@ -169,7 +157,9 @@ pkg_setup() { } src_prepare() { - eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch + eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch + eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638 cmake_src_prepare gnome2_src_prepare } @@ -194,14 +184,9 @@ src_configure() { # Try to use less memory, bug #469942 (see Fedora .spec for reference) # --no-keep-memory doesn't work on ia64, bug #502492 if ! use ia64; then - append-ldflags "-Wl,--no-keep-memory" + append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory") fi - # We try to use gold when possible for this package -# if ! tc-ld-is-gold ; then -# append-ldflags "-Wl,--reduce-memory-overheads" -# fi - # Ruby situation is a bit complicated. See bug 513888 local rubyimpl local ruby_interpreter="" @@ -216,64 +201,51 @@ src_configure() { # TODO: Check Web Audio support # should somehow let user select between them? - # - # opengl needs to be explicetly handled, bug #576634 - - local use_wpe_renderer=OFF - local opengl_enabled - if use opengl || use gles2-only; then - opengl_enabled=ON - use wayland && use_wpe_renderer=ON - else - opengl_enabled=OFF - fi local mycmakeargs=( - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_QUARTZ_TARGET=$(usex aqua) + ${ruby_interpreter} + $(cmake_use_find_package gles2-only OpenGLES2) + $(cmake_use_find_package egl EGL) + $(cmake_use_find_package !gles2-only OpenGL) + -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that + -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy + -DPORT=GTK + # Source/cmake/WebKitFeatures.cmake -DENABLE_API_TESTS=$(usex test) - -DENABLE_GTKDOC=$(usex gtk-doc) + -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) + -DENABLE_GAMEPAD=$(usex gamepad) -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) - $(cmake_use_find_package gles2-only OpenGLES2) - -DENABLE_GLES2=$(usex gles2-only) -DENABLE_MINIBROWSER=$(usex examples) + -DENABLE_SPELLCHECK=$(usex spell) + -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) -DENABLE_VIDEO=$(usex gstreamer) + -DENABLE_WEBGL=ON + # Supported only under ANGLE and default off PRIVATE option still@2.34.1, see + # https://bugs.webkit.org/show_bug.cgi?id=225563 + # https://bugs.webkit.org/show_bug.cgi?id=224888 + -DENABLE_WEBGL2=OFF -DENABLE_WEB_AUDIO=$(usex gstreamer) + # Source/cmake/OptionsGTK.cmake + -DENABLE_GLES2=$(usex gles2-only) + -DENABLE_GTKDOC=$(usex gtk-doc) -DENABLE_INTROSPECTION=$(usex introspection) + -DENABLE_QUARTZ_TARGET=$(usex aqua) + -DENABLE_WAYLAND_TARGET=$(usex wayland) + -DENABLE_X11_TARGET=$(usex X) + -DUSE_AVIF=$(usex avif) + -DUSE_GTK4=OFF + -DUSE_LCMS=$(usex lcms) + -DUSE_LIBHYPHEN=ON -DUSE_LIBNOTIFY=$(usex libnotify) -DUSE_LIBSECRET=$(usex gnome-keyring) + -DUSE_OPENGL_OR_ES=ON -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_WOFF2=ON - -DENABLE_SPELLCHECK=$(usex spell) + -DUSE_SOUP2=ON -DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging - -DENABLE_GAMEPAD=$(usex gamepad) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland - $(cmake_use_find_package egl EGL) - $(cmake_use_find_package opengl OpenGL) - -DENABLE_X11_TARGET=$(usex X) - -DUSE_OPENGL_OR_ES=${opengl_enabled} - -DENABLE_WEBGL=${opengl_enabled} - # Supported only under ANGLE, see - # https://bugs.webkit.org/show_bug.cgi?id=225563 - # https://bugs.webkit.org/show_bug.cgi?id=224888 - -DENABLE_WEBGL2=OFF - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy - -DPORT=GTK - ${ruby_interpreter} + -DUSE_WOFF2=ON + -DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland ) - # Allow it to use GOLD when possible as it has all the magic to - # detect when to use it and using gold for this concrete package has - # multiple advantages and is also the upstream default, bug #585788 -# if tc-ld-is-gold ; then -# mycmakeargs+=( -DUSE_LD_GOLD=ON ) -# else -# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) -# fi - # https://bugs.gentoo.org/761238 append-cppflags -DNDEBUG |