commit: b7c2a81ef769fd280d7edc739c2b88916a23b028
parent 9dd1eafcc5fa9c3d2a4d5f52c8822eafec6b4f5f
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Mon, 12 Sep 2022 18:54:58 +0200
net-libs/webkit-gtk: Change USE=experimental into more precise USE=webrtc
Diffstat:
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
@@ -8,12 +8,12 @@
<use>
<flag name="avif">Enable AVIF support via <pkg>media-libs/libavif</pkg></flag>
<flag name="egl">Enable EGL support</flag>
- <flag name="experimental">Enable experimental features</flag>
<flag name="gamepad">Enable gamepad support via <pkg>dev-libs/libmanette</pkg></flag>
<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
<flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL</flag>
<flag name="jumbo-build">Combine source files to speed up build process</flag>
<flag name="seccomp">Enable sandboxing functionality through <pkg>sys-apps/bubblewrap</pkg></flag>
<flag name="webgl">Enable WebGL support</flag>
+ <flag name="webrtc">Enable WebRTC support</flag>
</use>
</pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.37.1-r100.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.37.1-r100.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-IUSE="aqua +avif debug doc +egl examples experimental gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
+IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland webrtc +X"
# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
@@ -34,7 +34,6 @@ RESTRICT="test"
# Dependencies found at Source/cmake/OptionsGTK.cmake
# 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)
RDEPEND="
>=x11-libs/cairo-1.16.0:=[X?]
@@ -63,10 +62,11 @@ RDEPEND="
gstreamer? (
>=media-libs/gstreamer-1.14:1.0
>=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[X?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+ webrtc? ( media-plugins/gst-plugins-webrtc:1.0 )
)
X? (
@@ -215,7 +215,6 @@ src_configure() {
# Source/cmake/WebKitFeatures.cmake
-DENABLE_API_TESTS=$(usex test)
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
- -DENABLE_EXPERIMENTAL_FEATURES=$(usex experimental)
-DENABLE_GAMEPAD=$(usex gamepad)
-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-DENABLE_MINIBROWSER=$(usex examples)
@@ -241,6 +240,7 @@ src_configure() {
-DENABLE_JOURNALD_LOG=$(usex systemd)
-DENABLE_QUARTZ_TARGET=$(usex aqua)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DENABLE_WEB_RTC=$(usex webrtc)
-DENABLE_X11_TARGET=$(usex X)
-DUSE_ANGLE_WEBGL=OFF
-DUSE_AVIF=$(usex avif)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.37.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.37.1-r200.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="5.0/0" # soname version of libwebkit2gtk-5.0
-IUSE="aqua +avif debug doc +egl examples experimental gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
+IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland webrtc +X"
# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
@@ -34,7 +34,6 @@ RESTRICT="test"
# Dependencies found at Source/cmake/OptionsGTK.cmake
# 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)
RDEPEND="
>=x11-libs/cairo-1.16.0:=[X?]
@@ -63,10 +62,11 @@ RDEPEND="
gstreamer? (
>=media-libs/gstreamer-1.14:1.0
>=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[X?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+ webrtc? ( media-plugins/gst-plugins-webrtc:1.0 )
)
X? (
@@ -215,7 +215,6 @@ src_configure() {
# Source/cmake/WebKitFeatures.cmake
-DENABLE_API_TESTS=$(usex test)
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
- -DENABLE_EXPERIMENTAL_FEATURES=$(usex experimental)
-DENABLE_GAMEPAD=$(usex gamepad)
-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-DENABLE_MINIBROWSER=$(usex examples)
@@ -241,6 +240,7 @@ src_configure() {
-DENABLE_JOURNALD_LOG=$(usex systemd)
-DENABLE_QUARTZ_TARGET=$(usex aqua)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DENABLE_WEB_RTC=$(usex webrtc)
-DENABLE_X11_TARGET=$(usex X)
-DUSE_ANGLE_WEBGL=OFF
-DUSE_AVIF=$(usex avif)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.37.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.37.1.ebuild
@@ -17,7 +17,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
-IUSE="aqua +avif debug doc +egl examples experimental gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland +X"
+IUSE="aqua +avif debug doc +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build lcms libnotify +seccomp spell systemd test wayland webrtc +X"
# gstreamer with opengl/gles2 needs egl
REQUIRED_USE="
@@ -34,7 +34,6 @@ RESTRICT="test"
# Dependencies found at Source/cmake/OptionsGTK.cmake
# 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)
RDEPEND="
>=x11-libs/cairo-1.16.0:=[X?]
@@ -63,10 +62,11 @@ RDEPEND="
gstreamer? (
>=media-libs/gstreamer-1.14:1.0
>=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[X?]
+ gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+ !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+ webrtc? ( media-plugins/gst-plugins-webrtc:1.0 )
)
X? (
@@ -215,7 +215,6 @@ src_configure() {
# Source/cmake/WebKitFeatures.cmake
-DENABLE_API_TESTS=$(usex test)
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
- -DENABLE_EXPERIMENTAL_FEATURES=$(usex experimental)
-DENABLE_GAMEPAD=$(usex gamepad)
-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-DENABLE_MINIBROWSER=$(usex examples)
@@ -241,6 +240,7 @@ src_configure() {
-DENABLE_JOURNALD_LOG=$(usex systemd)
-DENABLE_QUARTZ_TARGET=$(usex aqua)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
+ -DENABLE_EXPERIMENTAL_FEATURES=$(usex experimental)
-DENABLE_X11_TARGET=$(usex X)
-DUSE_ANGLE_WEBGL=OFF
-DUSE_AVIF=$(usex avif)
