Сравнение webkit-gtk-2.40.5-r600 с webkit-gtk-2.42.0

/usr/portage/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild 2023-10-09 14:52:34.604368479 +0300
14 14
SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
15 15

  
16 16
LICENSE="LGPL-2+ BSD"
17
SLOT="6/0" # soname version of libwebkit2gtk-6.0
18
KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
17
SLOT="4/37" # soname version of libwebkit2gtk-4.0
18
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
19 19

  
20
IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
20
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
21 21
REQUIRED_USE="|| ( aqua wayland X )"
22 22

  
23 23
# Tests do not run when built from tarballs
......
29 29
# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
30 30
# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
31 31
# TODO: gst-plugins-base[X] is only needed when build configuration ends up
32
# with GLX set, but that's a bit automagic too to fix
33
# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
32
#       with GLX set, but that's a bit automagic too to fix
34 33
RDEPEND="
35 34
	>=x11-libs/cairo-1.16.0[X?]
36 35
	>=media-libs/fontconfig-2.13.0:1.0
37 36
	>=media-libs/freetype-2.9.0:2
38 37
	>=dev-libs/libgcrypt-1.7.0:0=
39 38
	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
40
	gui-libs/gtk:4[introspection?]
41 39
	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
42 40
	>=dev-libs/icu-61.2:=
43 41
	media-libs/libjpeg-turbo:0=
44 42
	>=media-libs/libepoxy-1.4.0
45
	>=net-libs/libsoup-3.0.8:3.0[introspection?]
43
	>=net-libs/libsoup-2.54:2.4[introspection?]
46 44
	>=dev-libs/libxml2-2.8.0:2
47 45
	>=media-libs/libpng-1.4:0=
48 46
	dev-db/sqlite:3
......
60 58
	gstreamer? (
61 59
		>=media-libs/gstreamer-1.20:1.0
62 60
		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
63
		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
64
		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
61
		media-libs/gst-plugins-base:1.0[opengl]
65 62
		>=media-plugins/gst-plugins-opus-1.20:1.0
66 63
		>=media-libs/gst-plugins-bad-1.20:1.0
67 64
	)
......
76 73

  
77 74
	dev-libs/hyphen
78 75
	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
76
	jpegxl? ( >=media-libs/libjxl-0.7.0 )
79 77
	avif? ( >=media-libs/libavif-0.9.0:= )
80 78
	lcms? ( media-libs/lcms:2 )
81 79

  
82 80
	media-libs/mesa
83 81
	media-libs/libglvnd
84 82
	wayland? (
85
		dev-libs/wayland
86
		>=dev-libs/wayland-protocols-1.12
83
		>=dev-libs/wayland-1.15
84
		>=dev-libs/wayland-protocols-1.15
87 85
		>=gui-libs/libwpe-1.5.0:1.0
88 86
		>=gui-libs/wpebackend-fdo-1.7.0:1.0
89 87
	)
......
96 94

  
97 95
	systemd? ( sys-apps/systemd:= )
98 96
	gamepad? ( >=dev-libs/libmanette-0.2.4 )
99
	!<net-libs/webkit-gtk-2.38:4
100 97
"
101 98
DEPEND="${RDEPEND}"
102 99
# Need real bison, not yacc
......
151 148
src_prepare() {
152 149
	cmake_src_prepare
153 150
	gnome2_src_prepare
154

  
155
	eapply "${FILESDIR}/${PV}-Fix-build-failure-when-gstreamer-support-is-disabled.patch"
156 151
}
157 152

  
158 153
src_configure() {
......
201 196
	local mycmakeargs=(
202 197
		-DPython_EXECUTABLE="${PYTHON}"
203 198
		${ruby_interpreter}
204
		$(cmake_use_find_package gles2-only OpenGLES2)
205
		$(cmake_use_find_package !gles2-only OpenGL)
206 199
		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
207 200
		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
208 201
		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
......
219 212
		-DENABLE_VIDEO=$(usex gstreamer)
220 213
		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
221 214
		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
222
		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
215
		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
223 216
		-DENABLE_WEBGL=ON
224 217
		-DENABLE_WEB_AUDIO=$(usex gstreamer)
225 218
		-DUSE_AVIF=$(usex avif)
226 219
		# Source/cmake/OptionsGTK.cmake
227
		-DENABLE_GLES2=$(usex gles2-only)
228 220
		-DENABLE_DOCUMENTATION=OFF
229 221
		-DENABLE_INTROSPECTION=$(usex introspection)
230 222
		-DENABLE_JOURNALD_LOG=$(usex systemd)
......
232 224
		-DENABLE_WAYLAND_TARGET=$(usex wayland)
233 225
		-DENABLE_X11_TARGET=$(usex X)
234 226
		-DUSE_GBM=ON
235
		-DUSE_GTK4=ON # webkit2gtk-6.0
236
		-DUSE_JPEGXL=OFF
227
		-DUSE_GTK4=OFF
228
		-DUSE_JPEGXL=$(usex jpegxl)
237 229
		-DUSE_LCMS=$(usex lcms)
238 230
		-DUSE_LIBHYPHEN=ON
239 231
		-DUSE_LIBSECRET=$(usex keyring)
240 232
		-DUSE_OPENGL_OR_ES=ON
241 233
		-DUSE_OPENJPEG=$(usex jpeg2k)
242
		-DUSE_SOUP2=OFF
234
		-DUSE_SOUP2=ON
243 235
		-DUSE_WOFF2=ON
244 236
	)
245 237

  
Спасибо!