Title: [225327] trunk/Tools
Revision
225327
Author
mcatanz...@igalia.com
Date
2017-11-30 07:01:53 -0800 (Thu, 30 Nov 2017)

Log Message

[WPE] Stop building Wayland in JHBuild moduleset
https://bugs.webkit.org/show_bug.cgi?id=179951

Reviewed by Žan Doberšek.

Since Wayland is not used for running tests, and since it does not seem to depend on
anything in the JHBuild moduleset, I think we can remove it safely without having to worry
that the system version of Wayland might use libraries in the JHBuild environment (which
would be unsafe).

* wpe/install-dependencies: Install Wayland.
* wpe/jhbuild.modules: Stop building Wayland.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (225326 => 225327)


--- trunk/Tools/ChangeLog	2017-11-30 13:48:46 UTC (rev 225326)
+++ trunk/Tools/ChangeLog	2017-11-30 15:01:53 UTC (rev 225327)
@@ -1,3 +1,18 @@
+2017-11-30  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        [WPE] Stop building Wayland in JHBuild moduleset
+        https://bugs.webkit.org/show_bug.cgi?id=179951
+
+        Reviewed by Žan Doberšek.
+
+        Since Wayland is not used for running tests, and since it does not seem to depend on
+        anything in the JHBuild moduleset, I think we can remove it safely without having to worry
+        that the system version of Wayland might use libraries in the JHBuild environment (which
+        would be unsafe).
+
+        * wpe/install-dependencies: Install Wayland.
+        * wpe/jhbuild.modules: Stop building Wayland.
+
 2017-11-30  Alexey Proskuryakov  <a...@apple.com>
 
         Silence the BitVector leak for

Modified: trunk/Tools/wpe/install-dependencies (225326 => 225327)


--- trunk/Tools/wpe/install-dependencies	2017-11-30 13:48:46 UTC (rev 225326)
+++ trunk/Tools/wpe/install-dependencies	2017-11-30 15:01:53 UTC (rev 225327)
@@ -122,6 +122,7 @@
         libvpx-dev \
         libxcb-xkb-dev \
         libxml-libxml-perl \
+        libwayland-dev \
         luajit"
 
     # These are dependencies necessary for using webkit-patch
@@ -210,8 +211,9 @@
         mesa-libgl \
         opus \
         orc \
-        perl-xml-libxml\
-        v4l-utils"
+        perl-xml-libxml \
+        v4l-utils \
+        wayland"
 
     # These are dependencies necessary for using webkit-patch
     packages="$packages \
@@ -292,7 +294,8 @@
         opus-devel \
         orc-devel \
         perl-XML-LibXML \
-        pulseaudio-libs-devel"
+        pulseaudio-libs-devel \
+        wayland-devel"
 
     # These are dependencies necessary for using webkit-patch
     packages="$packages

Modified: trunk/Tools/wpe/jhbuild.modules (225326 => 225327)


--- trunk/Tools/wpe/jhbuild.modules	2017-11-30 13:48:46 UTC (rev 225326)
+++ trunk/Tools/wpe/jhbuild.modules	2017-11-30 15:01:53 UTC (rev 225327)
@@ -16,7 +16,6 @@
       <dep package="freetype6"/>
       <dep package="harfbuzz"/>
       <dep package="xkbcommon"/>
-      <dep package="wayland"/>
       <dep package="webkit-gstreamer-testing-dependencies"/>
       <dep package="wpe"/>
       <dep package="wpe-mesa"/>
@@ -36,8 +35,6 @@
       href=""
   <repository type="tarball" name="freedesktop.org"
       href=""
-  <repository type="tarball" name="wayland.freedesktop.org"
-      href=""
   <repository type="git" name="github.com"
       href=""
   <repository type="tarball" name="github-tarball"
@@ -161,14 +158,6 @@
             hash="sha1:7127993bfb69e13cdff25fb8b3c8f26ce6be5bfa"/>
   </autotools>
 
-  <autotools id="wayland"
-             autogen-sh="configure"
-             autogenargs="--disable-documentation">
-    <branch module="releases/wayland-1.10.0.tar.xz" version="1.10.0"
-            repo="wayland.freedesktop.org"
-            hash="sha256:4bf6e790aa6f50ab3825676282ecd75850ec9c4767af96ecb7127b1f3c3d60dc"/>
-  </autotools>
-
   <cmake id="wpe">
     <branch repo="github.com" module="WebPlatformForEmbedded/WPEBackend.git"
             tag="3013faaebab42e7ef7497b3850a2902978eb3d6f" />
@@ -178,7 +167,6 @@
     <dependencies>
       <dep package="wpe" />
       <dep package="glib" />
-      <dep package="wayland" />
       <dep package="xkbcommon" />
     </dependencies>
     <branch repo="github.com" module="WebPlatformForEmbedded/WPEBackend-mesa.git"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to