commit: 88c7bedbdcea49055b655d67324a1817f4290991
parent 79c49d5068e64f091b5181558ac5a43290b8ff23
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 26 Sep 2023 10:56:50 +0200
net-libs/webkit-gtk: Synchronise with ::gentoo
Diffstat:
3 files changed, 145 insertions(+), 157 deletions(-)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_MAKEFILE_GENERATOR="ninja"
PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
-inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
MY_P="webkitgtk-${PV}"
DESCRIPTION="Open source web browser engine"
@@ -18,16 +18,12 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
# See https://bugs.webkit.org/show_bug.cgi?id=254717
LICENSE="LGPL-2+ BSD Apache-2.0"
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k jpegxl +jumbo-build lcms +seccomp spell systemd test wayland webrtc +X"
+IUSE="aqua +avif dbus doc examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms +seccomp spell systemd wayland webrtc +X"
-# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
doc? ( introspection )
- gles2-only? ( egl )
- gstreamer? ( egl )
- wayland? ( egl )
webrtc? ( gstreamer )
|| ( aqua wayland X )
"
@@ -37,8 +33,6 @@ REQUIRED_USE="
RESTRICT="test"
# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
RDEPEND="
>=x11-libs/cairo-1.16.0:=[X?]
>=media-libs/fontconfig-2.13.0:1.0
@@ -48,6 +42,7 @@ RDEPEND="
>=media-libs/harfbuzz-1.4.2:=[icu(+)]
>=dev-libs/icu-61.2:=
media-libs/libjpeg-turbo:0=
+ >=media-libs/libepoxy-1.4.0
>=net-libs/libsoup-2.99.9:3.0[introspection?]
>=dev-libs/libxml2-2.8.0:2
>=media-libs/libpng-1.4:0=
@@ -56,20 +51,19 @@ RDEPEND="
>=dev-libs/atk-2.16.0[introspection?]
media-libs/libwebp:=
- >=dev-libs/glib-2.67.1:2
+ >=dev-libs/glib-2.70.0:2
>=dev-libs/libxslt-1.1.7
media-libs/woff2
- gnome-keyring? ( app-crypt/libsecret )
+ keyring? ( app-crypt/libsecret )
introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
dev-libs/libtasn1:=
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?,X?]
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
- >=media-libs/gst-plugins-bad-1.14:1.0[X?]
- gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
- !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+ >=media-libs/gstreamer-1.20:1.0
+ >=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+ media-libs/gst-plugins-base:1.0[opengl]
+ >=media-plugins/gst-plugins-opus-1.20:1.0
+ >=media-libs/gst-plugins-bad-1.20:1.0[X?]
)
webrtc? (
media-plugins/gst-plugins-webrtc:1.0
@@ -81,7 +75,8 @@ RDEPEND="
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXrender
- x11-libs/libXt )
+ x11-libs/libXt
+ )
dev-libs/hyphen
jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
@@ -89,12 +84,11 @@ RDEPEND="
avif? ( >=media-libs/libavif-0.9.0:= )
lcms? ( media-libs/lcms:2 )
- egl? ( media-libs/mesa[egl(+)] )
- gles2-only? ( media-libs/mesa[gles2] )
- !gles2-only? ( virtual/opengl )
+ media-libs/mesa
+ media-libs/libglvnd
wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.12
+ >=dev-libs/wayland-1.15
+ >=dev-libs/wayland-protocols-1.15
>=gui-libs/libwpe-1.5.0:1.0
>=gui-libs/wpebackend-fdo-1.7.0:1.0
)
@@ -115,6 +109,7 @@ BDEPEND="
${RUBY_DEPS}
dev-util/glib-utils
>=dev-util/gperf-3.0.1
+ dev-util/unifdef
>=sys-devel/bison-2.4.3
|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
sys-devel/gettext
@@ -125,13 +120,8 @@ BDEPEND="
virtual/perl-Carp
virtual/perl-JSON-PP
+ dbus? ( dev-util/gdbus-codegen )
doc? ( dev-util/gi-docgen )
- geolocation? ( dev-util/gdbus-codegen )
- >=dev-util/cmake-3.10
- dev-util/unifdef
-"
-RDEPEND="${RDEPEND}
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
"
S="${WORKDIR}/${MY_P}"
@@ -165,19 +155,12 @@ src_prepare() {
}
src_configure() {
- if use debug; then
- CMAKE_BUILD_TYPE="Debug"
- else
- # TODO: Release type if -g* is unspecified
- CMAKE_BUILD_TYPE="RelWithDebInfo"
- fi
-
# Respect CC, otherwise fails on prefix #395875
tc-export CC
# WebkitGTK doesn't likes -D_FORTIFY_SOURCE=2
- strip-flags
- filter-flags "-D_FORTIFY_SOURCE=*"
+ #strip-flags
+ #filter-flags "-D_FORTIFY_SOURCE=*"
# It does not compile on alpha without this in LDFLAGS
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
@@ -201,30 +184,37 @@ src_configure() {
# Ruby situation is a bit complicated. See bug 513888
local rubyimpl
local ruby_interpreter=""
+ local RUBY
for rubyimpl in ${USE_RUBY}; do
- if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+ RUBY="$(type -P ${rubyimpl})"
+ ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
fi
done
# This will rarely occur. Only a couple of corner cases could lead us to
# that failure. See bug 513888
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+ [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+ # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+ # so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+ sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
# TODO: Check Web Audio support
# should somehow let user select between them?
local mycmakeargs=(
${ruby_interpreter}
- -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-DPORT=GTK
# Source/cmake/WebKitFeatures.cmake
- -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_API_TESTS=OFF
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-DENABLE_GAMEPAD=$(usex gamepad)
- -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ -DENABLE_GEOLOCATION=$(usex dbus) # Runtime optional (talks over dbus service)
-DENABLE_MINIBROWSER=$(usex examples)
+ -DENABLE_PDFJS=$(usex pdf)
-DSHOULD_INSTALL_JS_SHELL=$(usex examples)
-DENABLE_SPELLCHECK=$(usex spell)
-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
@@ -237,28 +227,34 @@ src_configure() {
-DENABLE_DOCUMENTATION=$(usex doc)
-DENABLE_INTROSPECTION=$(usex introspection)
-DENABLE_JOURNALD_LOG=$(usex systemd)
- -DENABLE_PDFJS=OFF # gentoo has www-plugins/pdfjs
-DENABLE_QUARTZ_TARGET=$(usex aqua)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
-DENABLE_WEB_RTC=$(usex webrtc)
-DENABLE_MEDIA_STREAM=$(usex webrtc)
-DENABLE_X11_TARGET=$(usex X)
+ -DUSE_GBM=ON
#-DUSE_ANGLE_WEBGL=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_GTK4=OFF
-DUSE_JPEGXL=$(usex jpegxl)
-DUSE_LCMS=$(usex lcms)
-DUSE_LIBHYPHEN=ON
- -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_LIBSECRET=$(usex keyring)
-DUSE_OPENGL_OR_ES=ON
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_SOUP2=OFF
-DUSE_WOFF2=ON
- -DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
)
# https://bugs.gentoo.org/761238
- #append-cppflags -DNDEBUG
+ append-cppflags -DNDEBUG
+
+ WK_USE_CCACHE=NO cmake_src_configure
+}
- cmake_src_configure
+pkg_postinst() {
+ use dbus && optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+ optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+ optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+ optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_MAKEFILE_GENERATOR="ninja"
PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
-inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
MY_P="webkitgtk-${PV}"
DESCRIPTION="Open source web browser engine"
@@ -18,16 +18,12 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
# See https://bugs.webkit.org/show_bug.cgi?id=254717
LICENSE="LGPL-2+ BSD Apache-2.0"
SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k jpegxl +jumbo-build lcms +seccomp spell systemd test wayland webrtc +X"
+IUSE="aqua +avif dbus doc examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms +seccomp spell systemd wayland webrtc +X"
-# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
doc? ( introspection )
- gles2-only? ( egl )
- gstreamer? ( egl )
- wayland? ( egl )
webrtc? ( gstreamer )
|| ( aqua wayland X )
"
@@ -37,17 +33,16 @@ REQUIRED_USE="
RESTRICT="test"
# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
RDEPEND="
>=x11-libs/cairo-1.16.0:=[X?]
>=media-libs/fontconfig-2.13.0:1.0
>=media-libs/freetype-2.9.0:2
>=dev-libs/libgcrypt-1.7.0:0=
- >=gui-libs/gtk-3.98.5:4[aqua?,introspection?,wayland?,X?]
+ >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
>=media-libs/harfbuzz-1.4.2:=[icu(+)]
>=dev-libs/icu-61.2:=
media-libs/libjpeg-turbo:0=
+ >=media-libs/libepoxy-1.4.0
>=net-libs/libsoup-2.99.9:3.0[introspection?]
>=dev-libs/libxml2-2.8.0:2
>=media-libs/libpng-1.4:0=
@@ -56,20 +51,19 @@ RDEPEND="
>=dev-libs/atk-2.16.0[introspection?]
media-libs/libwebp:=
- >=dev-libs/glib-2.67.1:2
+ >=dev-libs/glib-2.70.0:2
>=dev-libs/libxslt-1.1.7
media-libs/woff2
- gnome-keyring? ( app-crypt/libsecret )
+ keyring? ( app-crypt/libsecret )
introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
dev-libs/libtasn1:=
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?,X?]
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
- >=media-libs/gst-plugins-bad-1.14:1.0[X?]
- gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
- !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+ >=media-libs/gstreamer-1.20:1.0
+ >=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+ media-libs/gst-plugins-base:1.0[opengl]
+ >=media-plugins/gst-plugins-opus-1.20:1.0
+ >=media-libs/gst-plugins-bad-1.20:1.0[X?]
)
webrtc? (
media-plugins/gst-plugins-webrtc:1.0
@@ -81,7 +75,8 @@ RDEPEND="
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXrender
- x11-libs/libXt )
+ x11-libs/libXt
+ )
dev-libs/hyphen
jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
@@ -89,12 +84,11 @@ RDEPEND="
avif? ( >=media-libs/libavif-0.9.0:= )
lcms? ( media-libs/lcms:2 )
- egl? ( media-libs/mesa[egl(+)] )
- gles2-only? ( media-libs/mesa[gles2] )
- !gles2-only? ( virtual/opengl )
+ media-libs/mesa
+ media-libs/libglvnd
wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.12
+ >=dev-libs/wayland-1.15
+ >=dev-libs/wayland-protocols-1.15
>=gui-libs/libwpe-1.5.0:1.0
>=gui-libs/wpebackend-fdo-1.7.0:1.0
)
@@ -115,6 +109,7 @@ BDEPEND="
${RUBY_DEPS}
dev-util/glib-utils
>=dev-util/gperf-3.0.1
+ dev-util/unifdef
>=sys-devel/bison-2.4.3
|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
sys-devel/gettext
@@ -125,13 +120,8 @@ BDEPEND="
virtual/perl-Carp
virtual/perl-JSON-PP
+ dbus? ( dev-util/gdbus-codegen )
doc? ( dev-util/gi-docgen )
- geolocation? ( dev-util/gdbus-codegen )
- >=dev-util/cmake-3.10
- dev-util/unifdef
-"
-RDEPEND="${RDEPEND}
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
"
S="${WORKDIR}/${MY_P}"
@@ -165,19 +155,12 @@ src_prepare() {
}
src_configure() {
- if use debug; then
- CMAKE_BUILD_TYPE="Debug"
- else
- # TODO: Release type if -g* is unspecified
- CMAKE_BUILD_TYPE="RelWithDebInfo"
- fi
-
# Respect CC, otherwise fails on prefix #395875
tc-export CC
# WebkitGTK doesn't likes -D_FORTIFY_SOURCE=2
- strip-flags
- filter-flags "-D_FORTIFY_SOURCE=*"
+ #strip-flags
+ #filter-flags "-D_FORTIFY_SOURCE=*"
# It does not compile on alpha without this in LDFLAGS
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
@@ -201,30 +184,37 @@ src_configure() {
# Ruby situation is a bit complicated. See bug 513888
local rubyimpl
local ruby_interpreter=""
+ local RUBY
for rubyimpl in ${USE_RUBY}; do
- if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+ RUBY="$(type -P ${rubyimpl})"
+ ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
fi
done
# This will rarely occur. Only a couple of corner cases could lead us to
# that failure. See bug 513888
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+ [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+ # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+ # so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+ sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
# TODO: Check Web Audio support
# should somehow let user select between them?
local mycmakeargs=(
${ruby_interpreter}
- -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-DPORT=GTK
# Source/cmake/WebKitFeatures.cmake
- -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_API_TESTS=OFF
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-DENABLE_GAMEPAD=$(usex gamepad)
- -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ -DENABLE_GEOLOCATION=$(usex dbus) # Runtime optional (talks over dbus service)
-DENABLE_MINIBROWSER=$(usex examples)
+ -DENABLE_PDFJS=$(usex pdf)
-DSHOULD_INSTALL_JS_SHELL=$(usex examples)
-DENABLE_SPELLCHECK=$(usex spell)
-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
@@ -237,28 +227,34 @@ src_configure() {
-DENABLE_DOCUMENTATION=$(usex doc)
-DENABLE_INTROSPECTION=$(usex introspection)
-DENABLE_JOURNALD_LOG=$(usex systemd)
- -DENABLE_PDFJS=OFF # gentoo has www-plugins/pdfjs
-DENABLE_QUARTZ_TARGET=$(usex aqua)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
-DENABLE_WEB_RTC=$(usex webrtc)
-DENABLE_MEDIA_STREAM=$(usex webrtc)
-DENABLE_X11_TARGET=$(usex X)
+ -DUSE_GBM=ON
#-DUSE_ANGLE_WEBGL=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_GTK4=ON
-DUSE_JPEGXL=$(usex jpegxl)
-DUSE_LCMS=$(usex lcms)
-DUSE_LIBHYPHEN=ON
- -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_LIBSECRET=$(usex keyring)
-DUSE_OPENGL_OR_ES=ON
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_SOUP2=OFF
-DUSE_WOFF2=ON
- -DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
)
# https://bugs.gentoo.org/761238
- #append-cppflags -DNDEBUG
+ append-cppflags -DNDEBUG
+
+ WK_USE_CCACHE=NO cmake_src_configure
+}
- cmake_src_configure
+pkg_postinst() {
+ use dbus && optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+ optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+ optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+ optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_MAKEFILE_GENERATOR="ninja"
PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
-inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
MY_P="webkitgtk-${PV}"
DESCRIPTION="Open source web browser engine"
@@ -18,16 +18,12 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
# See https://bugs.webkit.org/show_bug.cgi?id=254717
LICENSE="LGPL-2+ BSD Apache-2.0"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k jpegxl +jumbo-build lcms +seccomp spell systemd test wayland webrtc +X"
+IUSE="aqua +avif dbus doc examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms +seccomp spell systemd wayland webrtc +X"
-# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
doc? ( introspection )
- gles2-only? ( egl )
- gstreamer? ( egl )
- wayland? ( egl )
webrtc? ( gstreamer )
|| ( aqua wayland X )
"
@@ -37,8 +33,6 @@ REQUIRED_USE="
RESTRICT="test"
# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
RDEPEND="
>=x11-libs/cairo-1.16.0:=[X?]
>=media-libs/fontconfig-2.13.0:1.0
@@ -48,6 +42,7 @@ RDEPEND="
>=media-libs/harfbuzz-1.4.2:=[icu(+)]
>=dev-libs/icu-61.2:=
media-libs/libjpeg-turbo:0=
+ >=media-libs/libepoxy-1.4.0
>=net-libs/libsoup-2.54:2.4[introspection?]
>=dev-libs/libxml2-2.8.0:2
>=media-libs/libpng-1.4:0=
@@ -56,20 +51,19 @@ RDEPEND="
>=dev-libs/atk-2.16.0[introspection?]
media-libs/libwebp:=
- >=dev-libs/glib-2.67.1:2
+ >=dev-libs/glib-2.70.0:2
>=dev-libs/libxslt-1.1.7
media-libs/woff2
- gnome-keyring? ( app-crypt/libsecret )
+ keyring? ( app-crypt/libsecret )
introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
dev-libs/libtasn1:=
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?,X?]
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
- >=media-libs/gst-plugins-bad-1.14:1.0[X?]
- gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
- !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+ >=media-libs/gstreamer-1.20:1.0
+ >=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+ media-libs/gst-plugins-base:1.0[opengl]
+ >=media-plugins/gst-plugins-opus-1.20:1.0
+ >=media-libs/gst-plugins-bad-1.20:1.0[X?]
)
webrtc? (
media-plugins/gst-plugins-webrtc:1.0
@@ -81,7 +75,8 @@ RDEPEND="
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXrender
- x11-libs/libXt )
+ x11-libs/libXt
+ )
dev-libs/hyphen
jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
@@ -89,12 +84,11 @@ RDEPEND="
avif? ( >=media-libs/libavif-0.9.0:= )
lcms? ( media-libs/lcms:2 )
- egl? ( media-libs/mesa[egl(+)] )
- gles2-only? ( media-libs/mesa[gles2] )
- !gles2-only? ( virtual/opengl )
+ media-libs/mesa
+ media-libs/libglvnd
wayland? (
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.12
+ >=dev-libs/wayland-1.15
+ >=dev-libs/wayland-protocols-1.15
>=gui-libs/libwpe-1.5.0:1.0
>=gui-libs/wpebackend-fdo-1.7.0:1.0
)
@@ -115,6 +109,7 @@ BDEPEND="
${RUBY_DEPS}
dev-util/glib-utils
>=dev-util/gperf-3.0.1
+ dev-util/unifdef
>=sys-devel/bison-2.4.3
|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
sys-devel/gettext
@@ -125,13 +120,8 @@ BDEPEND="
virtual/perl-Carp
virtual/perl-JSON-PP
+ dbus? ( dev-util/gdbus-codegen )
doc? ( dev-util/gi-docgen )
- geolocation? ( dev-util/gdbus-codegen )
- >=dev-util/cmake-3.10
- dev-util/unifdef
-"
-RDEPEND="${RDEPEND}
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
"
S="${WORKDIR}/${MY_P}"
@@ -165,19 +155,12 @@ src_prepare() {
}
src_configure() {
- if use debug; then
- CMAKE_BUILD_TYPE="Debug"
- else
- # TODO: Release type if -g* is unspecified
- CMAKE_BUILD_TYPE="RelWithDebInfo"
- fi
-
# Respect CC, otherwise fails on prefix #395875
tc-export CC
# WebkitGTK doesn't likes -D_FORTIFY_SOURCE=2
- strip-flags
- filter-flags "-D_FORTIFY_SOURCE=*"
+ #strip-flags
+ #filter-flags "-D_FORTIFY_SOURCE=*"
# It does not compile on alpha without this in LDFLAGS
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
@@ -201,30 +184,37 @@ src_configure() {
# Ruby situation is a bit complicated. See bug 513888
local rubyimpl
local ruby_interpreter=""
+ local RUBY
for rubyimpl in ${USE_RUBY}; do
- if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+ if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+ RUBY="$(type -P ${rubyimpl})"
+ ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
fi
done
# This will rarely occur. Only a couple of corner cases could lead us to
# that failure. See bug 513888
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+ [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+ # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+ # so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+ sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
# TODO: Check Web Audio support
# should somehow let user select between them?
local mycmakeargs=(
${ruby_interpreter}
- -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+ -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-DPORT=GTK
# Source/cmake/WebKitFeatures.cmake
- -DENABLE_API_TESTS=$(usex test)
+ -DENABLE_API_TESTS=OFF
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-DENABLE_GAMEPAD=$(usex gamepad)
- -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+ -DENABLE_GEOLOCATION=$(usex dbus) # Runtime optional (talks over dbus service)
-DENABLE_MINIBROWSER=$(usex examples)
+ -DENABLE_PDFJS=$(usex pdf)
-DSHOULD_INSTALL_JS_SHELL=$(usex examples)
-DENABLE_SPELLCHECK=$(usex spell)
-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
@@ -237,28 +227,34 @@ src_configure() {
-DENABLE_DOCUMENTATION=$(usex doc)
-DENABLE_INTROSPECTION=$(usex introspection)
-DENABLE_JOURNALD_LOG=$(usex systemd)
- -DENABLE_PDFJS=OFF # gentoo has www-plugins/pdfjs
-DENABLE_QUARTZ_TARGET=$(usex aqua)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
-DENABLE_WEB_RTC=$(usex webrtc)
-DENABLE_MEDIA_STREAM=$(usex webrtc)
-DENABLE_X11_TARGET=$(usex X)
+ -DUSE_GBM=ON
#-DUSE_ANGLE_WEBGL=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_GTK4=OFF
-DUSE_JPEGXL=$(usex jpegxl)
-DUSE_LCMS=$(usex lcms)
-DUSE_LIBHYPHEN=ON
- -DUSE_LIBSECRET=$(usex gnome-keyring)
+ -DUSE_LIBSECRET=$(usex keyring)
-DUSE_OPENGL_OR_ES=ON
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_SOUP2=ON
-DUSE_WOFF2=ON
- -DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
)
# https://bugs.gentoo.org/761238
- #append-cppflags -DNDEBUG
+ append-cppflags -DNDEBUG
+
+ WK_USE_CCACHE=NO cmake_src_configure
+}
- cmake_src_configure
+pkg_postinst() {
+ use dbus && optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+ optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+ optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+ optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
}
