Skip to content

Commit 55c709a

Browse files
dpinophiln
dpino
authored and
philn
committed
[JHBuild] Update WPE jhbuild modules
1 parent 67cd8a6 commit 55c709a

1 file changed

Lines changed: 74 additions & 50 deletions

File tree

‎Tools/wpe/jhbuild.modules‎

Lines changed: 74 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@
77

88
<metamodule id="webkitwpe-testing-dependencies">
99
<dependencies>
10-
<dep package="glib"/>
11-
<dep package="libsoup"/>
10+
<dep package="atk"/>
11+
<dep package="at-spi2-atk"/>
1212
<dep package="cairo"/>
13-
<dep package="fonts"/>
1413
<dep package="dicts"/>
1514
<dep package="fontconfig"/>
1615
<dep package="freetype6"/>
16+
<dep package="glib"/>
1717
<dep package="harfbuzz"/>
1818
<dep package="icu"/>
19-
<dep package="webkit-gstreamer-testing-dependencies"/>
20-
<dep package="libwpe"/>
21-
<dep package="wpebackend-fdo"/>
22-
<dep package="libgpg-error"/>
23-
<dep package="libgcrypt"/>
2419
<dep package="libepoxy"/>
25-
<dep package="wayland-protocols"/>
26-
<dep package="openjpeg"/>
27-
<dep package="xdg-dbus-proxy"/>
28-
<dep package="atk"/>
29-
<dep package="at-spi2-atk"/>
20+
<dep package="libgcrypt"/>
21+
<dep package="libgpg-error"/>
22+
<dep package="libjxl"/>
23+
<dep package="libwpe"/>
3024
<dep package="libxml2"/>
25+
<dep package="openjpeg"/>
3126
<dep package="shared-mime-info"/>
27+
<dep package="wayland-protocols"/>
28+
<dep package="wpebackend-fdo"/>
29+
<dep package="xdg-dbus-proxy"/>
30+
<dep package="webkit-gstreamer-testing-dependencies"/>
31+
<dep package="libsoup"/>
3232
</dependencies>
3333
</metamodule>
3434

@@ -48,13 +48,11 @@
4848
<repository type="git" name="github.com"
4949
href="https://github.com"/>
5050
<repository type="tarball" name="github-tarball"
51-
href="https://github.com/"/>
51+
href="https://github.com"/>
5252
<repository type="tarball" name="savannah.gnu.org"
5353
href="http://download.savannah.gnu.org/releases/"/>
5454
<repository type="tarball" name="gnupg.org"
5555
href="https://www.gnupg.org/ftp/gcrypt/"/>
56-
<repository type="tarball" name="wpewebkit"
57-
href="https://wpewebkit.org/releases/"/>
5856
<repository type="tarball" name="webkitgtk-jhbuild-mirror"
5957
href="http://webkitgtk.org/jhbuild_mirror/"/>
6058
<repository type="tarball" name="xmlsoft.org"
@@ -68,12 +66,11 @@
6866

6967
<meson id="glib"
7068
mesonargs="-Dlibmount=disabled -Dselinux=disabled">
71-
<dependencies>
72-
<dep package="libffi"/>
73-
</dependencies>
74-
<branch module="/sources/glib/2.70/glib-${version}.tar.xz" version="2.70.0"
69+
<pkg-config>glib-2.0.pc</pkg-config>
70+
<branch module="/sources/glib/2.72/glib-${version}.tar.xz"
71+
version="2.72.4"
7572
repo="download.gnome.org"
76-
hash="sha256:200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742">
73+
hash="sha256:8848aba518ba2f4217d144307a1d6cb9afcc92b54e5c13ac1f8c4d4608e96f0e">
7774
</branch>
7875
</meson>
7976

@@ -97,22 +94,20 @@
9794
hash="sha256:f8fd0aeb66252dfcc638f14d9be1e2362fdaf2ca86bde0444ff4d5cc961b560f"/>
9895
</autotools>
9996

100-
<meson id="libsoup" mesonargs="-Dintrospection=disabled -Dgssapi=disabled -Dvapi=disabled">
97+
<meson id="libsoup" mesonargs="-Dgssapi=disabled -Dvapi=disabled -Dntlm=disabled -Dsysprof=disabled -Dautobahn=disabled -Dpkcs11_tests=disabled">
98+
<pkg-config>libsoup-3.0.pc</pkg-config>
10199
<dependencies>
100+
<dep package="glib"/>
102101
<dep package="glib-networking"/>
103102
<dep package="libpsl"/>
104103
</dependencies>
105-
<branch module="/sources/libsoup/2.70/libsoup-${version}.tar.xz" version="2.70.0"
104+
<branch module="/sources/libsoup/3.0/libsoup-${version}.tar.xz"
105+
version="3.0.7"
106106
repo="download.gnome.org"
107-
hash="sha256:54b020f74aefa438918d8e53cff62e2b1e59efe2de53e06b19a4b07b1f4d5342">
107+
hash="sha256:ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8">
108108
</branch>
109109
</meson>
110110

111-
<autotools id="fonts" supports-non-srcdir-builds="no"
112-
skip-autogen="true">
113-
<branch repo="github.com" module="WebKitGTK/webkitgtk-test-fonts.git" checkoutdir="webkitgtk-test-fonts" tag="0.0.8"/>
114-
</autotools>
115-
116111
<autotools id="dicts" supports-non-srcdir-builds="no"
117112
skip-autogen="true">
118113
<branch repo="github.com" module="mrobinson/webkitgtk-test-dicts.git" checkoutdir="webkitgtk-test-dicts" tag="0.0.1"/>
@@ -164,9 +159,9 @@
164159
<autotools id="pixman"
165160
autogen-sh="configure"
166161
autogenargs="--enable-gtk=no">
167-
<branch module="releases/pixman-0.34.0.tar.gz" version="0.34.0"
162+
<branch module="releases/pixman-${version}.tar.gz" version="0.40.0"
168163
repo="cairographics.org"
169-
hash="sha1:a1b1683c1a55acce9d928fea1ab6ceb79142ddc7"/>
164+
hash="sha256:6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"/>
170165
</autotools>
171166

172167
<autotools id="cairo"
@@ -186,22 +181,22 @@
186181
</autotools>
187182

188183
<cmake id="libwpe">
189-
<branch module="libwpe-1.8.0.tar.xz" version="1.8.0"
190-
repo="wpewebkit"
191-
hash="sha256:a6f00a7d091cbd4db57fe7ee3b4c12c6350921d654ed79812800a26c888481d2"/>
184+
<branch repo="github-tarball"
185+
module="WebPlatformForEmbedded/libwpe/releases/download/${version}/libwpe-${version}.tar.xz"
186+
version="1.14.1"
187+
hash="sha256:b1d0cdcf0f8dbb494e65b0f7913e357106da9a0d57f4fbb7b9d1238a6dbe9ade"/>
192188
</cmake>
193189

194-
<cmake id="wpebackend-fdo">
190+
<meson id="wpebackend-fdo">
195191
<dependencies>
196192
<dep package="libwpe"/>
197-
<dep package="glib"/>
198193
</dependencies>
199-
<branch module="wpebackend-fdo-1.8.0.tar.xz" version="1.8.0"
200-
repo="wpewebkit"
201-
hash="sha256:9652a99c75fe1c6eab0585b6395f4e104b2427e4d1f42969f1f77df29920d253">
202-
<patch file="wpebackend-fdo-cmake-buildfix-3.10.patch" strip="1"/>
194+
<branch repo="github-tarball"
195+
module="Igalia/WPEBackend-fdo/releases/download/${version}/wpebackend-fdo-${version}.tar.xz"
196+
version="1.14.2"
197+
hash="sha256:93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38">
203198
</branch>
204-
</cmake>
199+
</meson>
205200

206201
<autotools id="libgpg-error" autogen-sh="autoreconf">
207202
<branch module="libgpg-error/libgpg-error-${version}.tar.bz2"
@@ -255,10 +250,10 @@
255250

256251
<distutils id="meson" python3="1">
257252
<branch repo="github-tarball"
258-
version="0.59.0"
253+
version="1.3.0"
259254
module="mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
260255
checkoutdir="meson-${version}"
261-
hash="sha256:e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476"/>
256+
hash="sha256:4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc"/>
262257
<dependencies>
263258
<dep package="ninja"/>
264259
</dependencies>
@@ -276,28 +271,28 @@
276271
</autotools>
277272

278273
<meson id="atk" mesonargs="-Dintrospection=false">
279-
<branch module="/sources/atk/2.34/atk-${version}.tar.xz" version="2.34.1"
274+
<branch module="/sources/atk/2.38/atk-${version}.tar.xz" version="2.38.0"
280275
repo="download.gnome.org"
281-
hash="sha256:d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb"/>
276+
hash="sha256:ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36"/>
282277
<dependencies>
283278
<dep package="glib"/>
284279
</dependencies>
285280
</meson>
286281

287282
<meson id="at-spi2-core" mesonargs="-Dintrospection=no -Dx11=no">
288-
<branch module="/sources/at-spi2-core/2.34/at-spi2-core-${version}.tar.xz" version="2.34.0"
283+
<branch module="/sources/at-spi2-core/2.44/at-spi2-core-${version}.tar.xz" version="2.44.1"
289284
repo="download.gnome.org"
290-
hash="sha256:d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6">
285+
hash="sha256:4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746">
291286
</branch>
292287
<dependencies>
293288
<dep package="glib"/>
294289
</dependencies>
295290
</meson>
296291

297-
<meson id="at-spi2-atk" mesonargs="-Dintrospection=no">
298-
<branch module="/sources/at-spi2-atk/2.34/at-spi2-atk-${version}.tar.xz" version="2.34.0"
292+
<meson id="at-spi2-atk" mesonargs="">
293+
<branch module="/sources/at-spi2-atk/2.38/at-spi2-atk-${version}.tar.xz" version="2.38.0"
299294
repo="download.gnome.org"
300-
hash="sha256:3a9a7e96a1eb549529e60a42201dd78ccce413d9c1706e16351cc5288e064500">
295+
hash="sha256:cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f">
301296
</branch>
302297
<dependencies>
303298
<dep package="glib"/>
@@ -325,4 +320,33 @@
325320
hash="sha256:c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf"/>
326321
</autotools>
327322

323+
<!-- libjxl required for JPEGXL support -->
324+
<cmake id="libjxl"
325+
cmakeargs="-DBUILD_TESTING=OFF
326+
-DPROVISION_DEPENDENCIES=ON
327+
-DJPEGXL_ENABLE_FUZZERS=OFF
328+
-DJPEGXL_ENABLE_DEVTOOLS=OFF
329+
-DJPEGXL_ENABLE_TOOLS=OFF
330+
-DJPEGXL_ENABLE_MANPAGES=OFF
331+
-DJPEGXL_ENABLE_BENCHMARK=OFF
332+
-DJPEGXL_ENABLE_EXAMPLES=OFF
333+
-DJPEGXL_ENABLE_JNI=OFF
334+
-DJPEGXL_ENABLE_VIEWERS=OFF
335+
-DJPEGXL_ENABLE_TCMALLOC=OFF
336+
-DJPEGXL_ENABLE_PLUGINS=OFF
337+
-DJPEGXL_ENABLE_COVERAGE=OFF
338+
-DJPEGXL_ENABLE_TRANSCODE_JPEG=OFF
339+
-DJPEGXL_ENABLE_SJPEG=OFF
340+
-DJPEGXL_STATIC=OFF
341+
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
342+
-DJPEGXL_ENABLE_SKCMS=ON">
343+
<branch module="libjxl/libjxl.git"
344+
version="0.8.2"
345+
tag="v0.8.2"
346+
checkoutdir="libjxl-0.8.2"
347+
repo="github.com">
348+
<patch file="libjxl-add-cmake-flag-provision-dependencies.patch" strip="1"/>
349+
</branch>
350+
</cmake>
351+
328352
</moduleset>

0 commit comments

Comments
 (0)