- Revision
- 292792
- Author
- [email protected]
- Date
- 2022-04-12 16:10:27 -0700 (Tue, 12 Apr 2022)
Log Message
[JHBuild] Update ATSPI, GLib and GStreamer libraries
https://bugs.webkit.org/show_bug.cgi?id=239117
Reviewed by Adrian Perez de Castro.
Update several libraries to the same version as their Flatpak
counterparts.
JHBuild dependencies didn't build because ATSPI required a more recent
version of gdbus-codegen, provided by GLib. The patch also fixes
dependencies build in WPE, which required to update several GStreamer
libs. Finally, ATSPI and GLib are added to the minimal dependencies
modules set to make it possible to build with A11y support via ATSPI.
* gstreamer/jhbuild.modules:
* gtk/jhbuild.modules:
* jhbuild/jhbuild-minimal.modules:
* wpe/jhbuild.modules:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (292791 => 292792)
--- trunk/Tools/ChangeLog 2022-04-12 23:02:14 UTC (rev 292791)
+++ trunk/Tools/ChangeLog 2022-04-12 23:10:27 UTC (rev 292792)
@@ -1,3 +1,24 @@
+2022-04-12 Diego Pino Garcia <[email protected]>
+
+ [JHBuild] Update ATSPI, GLib and GStreamer libraries
+ https://bugs.webkit.org/show_bug.cgi?id=239117
+
+ Reviewed by Adrian Perez de Castro.
+
+ Update several libraries to the same version as their Flatpak
+ counterparts.
+
+ JHBuild dependencies didn't build because ATSPI required a more recent
+ version of gdbus-codegen, provided by GLib. The patch also fixes
+ dependencies build in WPE, which required to update several GStreamer
+ libs. Finally, ATSPI and GLib are added to the minimal dependencies
+ modules set to make it possible to build with A11y support via ATSPI.
+
+ * gstreamer/jhbuild.modules:
+ * gtk/jhbuild.modules:
+ * jhbuild/jhbuild-minimal.modules:
+ * wpe/jhbuild.modules:
+
2022-04-12 Elliott Williams <[email protected]>
Reland "[XCBuild] Enable dependency validation by default"
Modified: trunk/Tools/gstreamer/jhbuild.modules (292791 => 292792)
--- trunk/Tools/gstreamer/jhbuild.modules 2022-04-12 23:02:14 UTC (rev 292791)
+++ trunk/Tools/gstreamer/jhbuild.modules 2022-04-12 23:10:27 UTC (rev 292792)
@@ -10,7 +10,6 @@
<dep package="gst-plugins-good"/>
<dep package="gst-plugins-bad"/>
<dep package="gst-libav"/>
- <dep package="gstreamer-vaapi"/>
<if condition-set="Thunder">
<dep package="thunder"/>
<dep package="widevine"/>
@@ -64,7 +63,9 @@
<dependencies>
<dep package="orc"/>
</dependencies>
- <branch hash="sha256:e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.16.2">
+ <branch hash="sha256:de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.20.1">
+ <path file="gstreamer-0001-typefind-Skip-parsing-of-data-URIs.patch" strip="1" />
+ <path file="gstreamer-0002-uri-Build-doubly-linked-list-by-prepending-items.patch" strip="1" />
</branch>
</meson>
@@ -75,8 +76,7 @@
<dependencies>
<dep package="gstreamer"/>
</dependencies>
- <branch hash="sha256:b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a" module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" repo="gstreamer" version="1.16.2">
- <patch file="base-0001-playbin-Handle-error-message-with-redirection-indica.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.3 -->
+ <branch hash="sha256:96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204" module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" repo="gstreamer" version="1.20.1">
</branch>
</meson>
@@ -84,14 +84,11 @@
<dependencies>
<dep package="gst-plugins-base"/>
</dependencies>
-
- <branch hash="sha256:40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319" module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" repo="gstreamer" version="1.16.2">
- <patch file="good-0001-qtdemux-Specify-REDIRECT-information-in-error-messag.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.3 -->
- <patch file="gst-plugins-good-0002-Check-if-an-upstream-demuxer-provided-a-default-kid.patch" strip="1" />
+ <branch hash="sha256:3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa" module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" repo="gstreamer" version="1.20.1">
</branch>
</meson>
- <meson id="gst-plugins-bad" mesonargs="-Dgtk_doc=disabled -Dintrospection=disabled -Dexamples=disabled -Dopenexr=disabled">
+ <meson id="gst-plugins-bad" mesonargs="-Dgtk_doc=disabled -Dintrospection=disabled -Dexamples=disabled -Dopenexr=disabled -Dopencv=disabled">
<dependencies>
<dep package="graphene"/>
<dep package="gst-plugins-base"/>
@@ -99,9 +96,7 @@
<dep package="aom"/>
<dep package="libsrtp"/>
</dependencies>
- <branch hash="sha256:f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.16.2">
- <patch file="gst-plugins-bad-0001-h264parse-Post-a-WARNING-when-data-is-broken.patch" strip="1"/> <!-- Merged, discussing backporting https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/386-->
- <patch file="gst-plugins-bad-0006-mssdemux-parse-protection-data.patch" strip="1" />
+ <branch hash="sha256:09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.20.1">
</branch>
</meson>
@@ -114,21 +109,10 @@
<dep package="gst-plugins-base"/>
<dep package="ffmpeg"/>
</dependencies>
- <branch hash="sha256:c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.16.2">
- <patch file="libav-0001-gstavviddec-Limit-default-number-of-decoder-threads.patch" strip="1"/> <!-- Merged, should be shipped in 1.16.3 https://gitlab.freedesktop.org/gstreamer/gst-libav/merge_requests/56 -->
+ <branch hash="sha256:91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.20.1">
</branch>
</meson>
- <meson id="gstreamer-vaapi" mesonargs="-Dgtk_doc=disabled -Dexamples=disabled">
- <branch hash="sha256:191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601" module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" repo="gstreamer" version="1.16.2" />
- <dependencies>
- <dep package="gstreamer"/>
- <dep package="gst-plugins-base"/>
- <dep package="gst-plugins-bad"/>
- <dep package="libva"/>
- </dependencies>
- </meson>
-
<meson id="libva" mesonargs="-Denable_va_messaging=false">
<branch module="intel/libva/archive/${version}.tar.gz" version="2.4.1"
hash="sha256:68ca8d071dcb84ac82e3c6d7f02a55937d9f690fcb215853f4aa1de8d459812f"
Modified: trunk/Tools/gtk/jhbuild.modules (292791 => 292792)
--- trunk/Tools/gtk/jhbuild.modules 2022-04-12 23:02:14 UTC (rev 292791)
+++ trunk/Tools/gtk/jhbuild.modules 2022-04-12 23:10:27 UTC (rev 292792)
@@ -229,9 +229,9 @@
<meson id="glib"
mesonargs="-Dlibmount=false -Dselinux=false">
- <branch module="/pub/GNOME/sources/glib/2.58/glib-${version}.tar.xz" version="2.58.1"
- repo="ftp.gnome.org"
- hash="sha256:97d6a9d926b6aa3dfaadad3077cfb43eec74432ab455dff14250c769d526d7d6">
+ <branch module="/sources/glib/2.70/glib-${version}.tar.xz" version="2.70.0"
+ repo="download.gnome.org"
+ hash="sha256:200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742">
</branch>
</meson>
@@ -239,9 +239,9 @@
<dependencies>
<dep package="glib"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib-networking/2.58/glib-networking-${version}.tar.xz" version="2.58.0"
- repo="ftp.gnome.org"
- hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/>
+ <branch module="/pub/GNOME/sources/glib-networking/2.70/glib-networking-${version}.tar.xz" version="2.70.0"
+ repo="download.gnome.org"
+ hash="sha256:66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35"/>
</meson>
<autotools id="libpsl"
@@ -295,15 +295,18 @@
</autotools>
<meson id="atk" mesonargs="-Dintrospection=false">
- <branch module="pub/GNOME/sources/atk/2.33/atk-2.33.3.tar.xz" version="2.33.3"
- repo="ftp.gnome.org"
- hash="sha256:532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe"/>
+ <branch module="/sources/atk/2.34/atk-${version}.tar.xz" version="2.34.1"
+ repo="download.gnome.org"
+ hash="sha256:d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb"/>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
</meson>
- <meson id="at-spi2-core" mesonargs="-Dintrospection=no">
- <branch module="pub/GNOME/sources/at-spi2-core/2.33/at-spi2-core-2.33.2.tar.xz" version="2.33.2"
- repo="ftp.gnome.org"
- hash="sha256:0e3f44707cccf9ec9098f84abdf91ea654c919eac3c688400f8d261383cc2abe">
+ <meson id="at-spi2-core" mesonargs="-Dintrospection=no -Dx11=no">
+ <branch module="/sources/at-spi2-core/2.34/at-spi2-core-${version}.tar.xz" version="2.34.0"
+ repo="download.gnome.org"
+ hash="sha256:d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6">
</branch>
<dependencies>
<dep package="glib"/>
@@ -310,12 +313,10 @@
</dependencies>
</meson>
- <meson id="at-spi2-atk">
- <branch module="pub/GNOME/sources/at-spi2-atk/2.33/at-spi2-atk-2.33.2.tar.xz" version="2.33.2"
- repo="ftp.gnome.org"
- hash="sha256:64d4351b245d717ec6f4f81fd40fe67481ff8e62d3893d465f01e71d9a3db3d3">
- <patch file="at-spi2-atk-tests-Replace-common-variable-with-usual-external.patch" strip="1"/>
- <patch file="at-spi2-atk-tests-fix-child_pid-reference.patch" strip="1"/>
+ <meson id="at-spi2-atk" mesonargs="-Dintrospection=no">
+ <branch module="/sources/at-spi2-atk/2.34/at-spi2-atk-${version}.tar.xz" version="2.34.0"
+ repo="download.gnome.org"
+ hash="sha256:3a9a7e96a1eb549529e60a42201dd78ccce413d9c1706e16351cc5288e064500">
</branch>
<dependencies>
<dep package="glib"/>
@@ -560,10 +561,13 @@
<distutils id="meson" python3="1">
<branch repo="github-tarball"
- version="0.50.1"
+ version="0.59.0"
module="mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
checkoutdir="meson-${version}"
- hash="sha256:f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc"/>
+ hash="sha256:e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476"/>
+ <dependencies>
+ <dep package="ninja"/>
+ </dependencies>
</distutils>
<autotools id="xdg-dbus-proxy" autogen-sh="configure">
Modified: trunk/Tools/jhbuild/jhbuild-minimal.modules (292791 => 292792)
--- trunk/Tools/jhbuild/jhbuild-minimal.modules 2022-04-12 23:02:14 UTC (rev 292791)
+++ trunk/Tools/jhbuild/jhbuild-minimal.modules 2022-04-12 23:10:27 UTC (rev 292792)
@@ -10,6 +10,10 @@
<dep package="libsoup"/>
<dep package="manette"/>
<dep package="libvpx"/>
+ <dep package="glib"/>
+ <dep package="glib-networking"/>
+ <dep package="atk"/>
+ <dep package="at-spi2-atk"/>
</dependencies>
</metamodule>
@@ -20,6 +24,10 @@
<dep package="libsoup"/>
<dep package="openxr"/>
<dep package="libvpx"/>
+ <dep package="glib"/>
+ <dep package="glib-networking"/>
+ <dep package="atk"/>
+ <dep package="at-spi2-atk"/>
</dependencies>
</metamodule>
@@ -127,7 +135,6 @@
hash="sha256:4fe0a4bed6b4c3ae7249d341031c27b32f8d9e0ffb5337d71cbcec7160362cf7"/>
</meson>
-
<!-- meson 0.50.1 required to build libsoup 2.69 -->
<distutils id="meson" python3="1">
<branch repo="github-tarball"
@@ -156,4 +163,59 @@
hash="sha256:85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a"/>
</autotools>
+ <!-- glib needed to upgrade gdbus-codegen -->
+ <meson id="glib"
+ mesonargs="-Dlibmount=disabled -Dselinux=disabled">
+ <dependencies>
+ <dep package="libffi"/>
+ </dependencies>
+ <branch module="/sources/glib/2.70/glib-${version}.tar.xz" version="2.70.0"
+ repo="download.gnome.org"
+ hash="sha256:200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742">
+ </branch>
+ </meson>
+
+ <meson id="glib-networking">
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ <branch module="/pub/GNOME/sources/glib-networking/2.70/glib-networking-${version}.tar.xz" version="2.70.0"
+ repo="download.gnome.org"
+ hash="sha256:66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35"/>
+ </meson>
+
+ <!-- atk needed to build with A11y support -->
+ <meson id="atk" mesonargs="-Dintrospection=false">
+ <branch module="/sources/atk/2.34/atk-${version}.tar.xz" version="2.34.1"
+ repo="download.gnome.org"
+ hash="sha256:d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb"/>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </meson>
+
+ <!-- at-spi2-core needed to build with A11y support -->
+ <meson id="at-spi2-core" mesonargs="-Dintrospection=no -Dx11=no">
+ <branch module="/sources/at-spi2-core/2.34/at-spi2-core-${version}.tar.xz" version="2.34.0"
+ repo="download.gnome.org"
+ hash="sha256:d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6">
+ </branch>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </meson>
+
+ <!-- at-spi2-atk needed to build with A11y support -->
+ <meson id="at-spi2-atk" mesonargs="-Dintrospection=no">
+ <branch module="/sources/at-spi2-atk/2.34/at-spi2-atk-${version}.tar.xz" version="2.34.0"
+ repo="download.gnome.org"
+ hash="sha256:3a9a7e96a1eb549529e60a42201dd78ccce413d9c1706e16351cc5288e064500">
+ </branch>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="atk"/>
+ <dep package="at-spi2-core"/>
+ </dependencies>
+ </meson>
+
</moduleset>
Modified: trunk/Tools/wpe/jhbuild.modules (292791 => 292792)
--- trunk/Tools/wpe/jhbuild.modules 2022-04-12 23:02:14 UTC (rev 292791)
+++ trunk/Tools/wpe/jhbuild.modules 2022-04-12 23:10:27 UTC (rev 292792)
@@ -67,13 +67,13 @@
</autotools>
<meson id="glib"
- mesonargs="-Dlibmount=false -Dselinux=false">
+ mesonargs="-Dlibmount=disabled -Dselinux=disabled">
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib/2.58/glib-${version}.tar.xz" version="2.58.1"
- repo="ftp.gnome.org"
- hash="sha256:97d6a9d926b6aa3dfaadad3077cfb43eec74432ab455dff14250c769d526d7d6">
+ <branch module="/sources/glib/2.70/glib-${version}.tar.xz" version="2.70.0"
+ repo="download.gnome.org"
+ hash="sha256:200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742">
</branch>
</meson>
@@ -81,9 +81,9 @@
<dependencies>
<dep package="glib"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib-networking/2.58/glib-networking-${version}.tar.xz" version="2.58.0"
- repo="ftp.gnome.org"
- hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/>
+ <branch module="/pub/GNOME/sources/glib-networking/2.70/glib-networking-${version}.tar.xz" version="2.70.0"
+ repo="download.gnome.org"
+ hash="sha256:66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35"/>
</meson>
<autotools id="libpsl"
@@ -255,10 +255,10 @@
<distutils id="meson" python3="1">
<branch repo="github-tarball"
- version="0.54.1"
+ version="0.59.0"
module="mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
checkoutdir="meson-${version}"
- hash="sha256:2f76fb4572762be13ee479292610091b4509af5788bcceb391fe222bcd0296dc"/>
+ hash="sha256:e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476"/>
<dependencies>
<dep package="ninja"/>
</dependencies>
@@ -275,11 +275,10 @@
</dependencies>
</autotools>
-
<meson id="atk" mesonargs="-Dintrospection=false">
- <branch module="pub/GNOME/sources/atk/2.33/atk-2.33.3.tar.xz" version="2.33.3"
- repo="ftp.gnome.org"
- hash="sha256:532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe"/>
+ <branch module="/sources/atk/2.34/atk-${version}.tar.xz" version="2.34.1"
+ repo="download.gnome.org"
+ hash="sha256:d4f0e3b3d21265fcf2bc371e117da51c42ede1a71f6db1c834e6976bb20997cb"/>
<dependencies>
<dep package="glib"/>
</dependencies>
@@ -286,9 +285,9 @@
</meson>
<meson id="at-spi2-core" mesonargs="-Dintrospection=no -Dx11=no">
- <branch module="pub/GNOME/sources/at-spi2-core/2.33/at-spi2-core-2.33.2.tar.xz" version="2.33.2"
- repo="ftp.gnome.org"
- hash="sha256:0e3f44707cccf9ec9098f84abdf91ea654c919eac3c688400f8d261383cc2abe">
+ <branch module="/sources/at-spi2-core/2.34/at-spi2-core-${version}.tar.xz" version="2.34.0"
+ repo="download.gnome.org"
+ hash="sha256:d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6">
</branch>
<dependencies>
<dep package="glib"/>
@@ -295,10 +294,10 @@
</dependencies>
</meson>
- <meson id="at-spi2-atk">
- <branch module="pub/GNOME/sources/at-spi2-atk/2.33/at-spi2-atk-2.33.2.tar.xz" version="2.33.2"
- repo="ftp.gnome.org"
- hash="sha256:64d4351b245d717ec6f4f81fd40fe67481ff8e62d3893d465f01e71d9a3db3d3">
+ <meson id="at-spi2-atk" mesonargs="-Dintrospection=no">
+ <branch module="/sources/at-spi2-atk/2.34/at-spi2-atk-${version}.tar.xz" version="2.34.0"
+ repo="download.gnome.org"
+ hash="sha256:3a9a7e96a1eb549529e60a42201dd78ccce413d9c1706e16351cc5288e064500">
</branch>
<dependencies>
<dep package="glib"/>
