[JHBuild] [WPE] Upgrade wayland and wayland-protocols

https://bugs.webkit.org/show_bug.cgi?id=266278

Reviewed by Carlos Garcia Campos.

After 271330@main, WPE build fails in systems featuring wayland < 1.20 and
wayland-protocols < 1.25.

* Tools/jhbuild/jhbuild-minimal.modules:
* Tools/wpe/jhbuild.modules:

Canonical link: https://commits.webkit.org/271926@main

Tools/jhbuild/jhbuild-minimal.modules

@@ -32,6 +32,8 @@
       <dep package="atk"/>
       <dep package="at-spi2-atk"/>
       <dep package="libsoup"/>
+      <dep package="wayland"/>
+      <dep package="wayland-protocols"/>
     </dependencies>
   </metamodule>
 
@@ -64,8 +66,8 @@
       href="https://dri.freedesktop.org"/>
   <repository type="tarball" name="mesa.freedesktop.org"
       href="https://mesa.freedesktop.org"/>
-  <repository type="tarball" name="wayland.freedesktop.org"
-      href="http://wayland.freedesktop.org"/>
+  <repository type="git" name="git.freedesktop.org/wayland"
+      href="https://gitlab.freedesktop.org/wayland"/>
   <repository type="tarball" name="llvm.org"
       href="http://llvm.org"/>
   <repository type="tarball" name="webkitgtk-jhbuild-mirror"
@@ -249,4 +251,16 @@
     </branch>
   </cmake>
 
+  <meson id="wayland" mesonargs="-Dtests=false -Ddocumentation=false -Ddtd_validation=false">
+    <branch tag="1.20.0"
+            checkoutdir="wayland-protocols"
+            repo="git.freedesktop.org/wayland" />
+  </meson>
+
+  <meson id="wayland-protocols">
+    <branch tag="1.25"
+            checkoutdir="wayland-protocols"
+            repo="git.freedesktop.org/wayland" />
+  </meson>
+
 </moduleset>

Tools/wpe/jhbuild.modules

@@ -24,6 +24,7 @@
       <dep package="libxml2"/>
       <dep package="openjpeg"/>
       <dep package="shared-mime-info"/>
+      <dep package="wayland"/>
       <dep package="wayland-protocols"/>
       <dep package="wpebackend-fdo"/>
       <dep package="xdg-dbus-proxy"/>
@@ -43,8 +44,8 @@
       href="http://cairographics.org"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://www.freedesktop.org"/>
-  <repository type="tarball" name="wayland.freedesktop.org"
-      href="http://wayland.freedesktop.org"/>
+  <repository type="git" name="git.freedesktop.org/wayland"
+      href="https://gitlab.freedesktop.org/wayland"/>
   <repository type="git" name="github.com"
       href="https://github.com"/>
   <repository type="tarball" name="github-tarball"
@@ -224,12 +225,17 @@
             version="1.5.4" repo="github-tarball"/>
   </autotools>
 
-  <autotools id="wayland-protocols" autogen-sh="configure">
-    <branch module="releases/wayland-protocols-${version}.tar.xz"
-            version="1.12"
-	    repo="wayland.freedesktop.org"
-	    hash="sha256:3b19e8a9e1e19474756a7069db23b90ca9b8ebb438448c6063b4a7fc89b7c8b2"/>
-  </autotools>
+  <meson id="wayland" mesonargs="-Dtests=false -Ddocumentation=false -Ddtd_validation=false">
+    <branch tag="1.20.0"
+            checkoutdir="wayland-protocols"
+            repo="git.freedesktop.org/wayland" />
+  </meson>
+
+  <meson id="wayland-protocols">
+    <branch tag="1.25"
+            checkoutdir="wayland-protocols"
+            repo="git.freedesktop.org/wayland" />
+  </meson>
 
   <meson id="graphene">
     <branch repo="github.com"