[GTK][jhbuild] misc cleanups and bumps
https://bugs.webkit.org/show_bug.cgi?id=197913
Patch by Philippe Normand <pnormand@igalia.com> on 2019-05-15
Reviewed by Xabier Rodriguez-Calvar.
* gstreamer/jhbuild.modules: Bump to libva 2.4.1 and switch to Meson.
* gtk/jhbuild.modules: Bump to Brotli 1.0.5 and Wayland 1.16.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@245324 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index feb759b..06198de 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2019-05-15 Philippe Normand <pnormand@igalia.com>
+
+ [GTK][jhbuild] misc cleanups and bumps
+ https://bugs.webkit.org/show_bug.cgi?id=197913
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * gstreamer/jhbuild.modules: Bump to libva 2.4.1 and switch to Meson.
+ * gtk/jhbuild.modules: Bump to Brotli 1.0.5 and Wayland 1.16.
+
2019-05-15 Chris Dumez <cdumez@apple.com>
Flaky API Test: TestWebKitAPI.ProcessSwap.NumberOfCachedProcesses
diff --git a/Tools/gstreamer/jhbuild.modules b/Tools/gstreamer/jhbuild.modules
index 957c7aa..da582b8 100644
--- a/Tools/gstreamer/jhbuild.modules
+++ b/Tools/gstreamer/jhbuild.modules
@@ -111,10 +111,10 @@
</dependencies>
</meson>
- <autotools id="libva" autogenargs="--enable-va-messaging=no">
- <branch module="intel/libva/releases/download/${version}/libva-${version}.tar.bz2" version="2.4.0"
- hash="sha256:99263056c21593a26f2ece812aee6fe60142b49e6cd46cb33c8dddf18fc19391"
+ <meson id="libva" mesonargs="-Denable_va_messaging=false">
+ <branch module="intel/libva/archive/${version}.tar.gz" version="2.4.1"
+ hash="sha256:68ca8d071dcb84ac82e3c6d7f02a55937d9f690fcb215853f4aa1de8d459812f"
checkoutdir="libva-${version}" repo="github-tarball"/>
- </autotools>
+ </meson>
</moduleset>
diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index 21b3fc0..7b006f7 100644
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -83,7 +83,7 @@
href="https://www.gnupg.org/ftp/gcrypt/"/>
<cmake id="brotli">
- <branch repo="github.com" module="google/brotli.git" checkoutdir="brotli" tag="v1.0.1"/>
+ <branch repo="github.com" module="google/brotli.git" checkoutdir="brotli" tag="v1.0.5"/>
</cmake>
<cmake id="woff2">
@@ -149,9 +149,9 @@
<dep package="freetype6"/>
<dep package="fontconfig"/>
</dependencies>
- <branch module="software/harfbuzz/release/harfbuzz-2.2.0.tar.bz2"
+ <branch module="software/harfbuzz/release/harfbuzz-${version}.tar.bz2"
version="2.2.0"
- checkoutdir="harfbuzz-2.2.0"
+ checkoutdir="harfbuzz-${version}"
repo="freedesktop.org"
hash="sha256:b7ccfcbd56b970a709e8b9ea9fb46c922c606c2feef8f086fb6a8492e530f810"/>
</autotools>
@@ -334,17 +334,17 @@
autogenargs="--disable-documentation">
<pkg-config>wayland-server.pc</pkg-config>
<branch module="releases/wayland-${version}.tar.xz"
- version="1.14.0"
+ version="1.16.0"
repo="wayland.freedesktop.org"
- hash="sha256:ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"/>
+ hash="sha256:4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5"/>
</autotools>
<autotools id="wayland-protocols"
autogen-sh="configure">
<branch module="releases/wayland-protocols-${version}.tar.xz"
- version="1.12"
+ version="1.16"
repo="wayland.freedesktop.org"
- hash="sha256:3b19e8a9e1e19474756a7069db23b90ca9b8ebb438448c6063b4a7fc89b7c8b2"/>
+ hash="sha256:6b1485951fdcd36a960c870c46f28b03a3e5121fb46246916333ed07f78c98c5"/>
</autotools>
<autotools id="weston"