[PATCH wayland-web] update xserver and wayland DDX branches

[ppaalanen at gmail.com]

From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

After the update, you get the latest xserver branch, which at the time
of writing is based on xserver 1.14.99.

You also get the latest xf86-video-wayland, which was renamed from
xf86-video-wlshm.

---

Hi,

is there any reason to not have these up-to-date(?) branches in the
website, rather than the old 1.12 xserver versions?

What is the intended Weston compatibility here? Are Weston 1.3.1 and
master supposed to work with both xwayland and xwayland-1.12 branches
of xserver?

What about the various DDXes vs. xserver vs. weston?
I assume there is no direct dependence between the video DDXes and
Weston.
---
 xserver.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xserver.html b/xserver.html
index 899ba50..db99dd0 100644
--- a/xserver.html
+++ b/xserver.html
@@ -44,13 +44,15 @@
 
 <h2>X.org</h2>
 
-<pre>    git clone git://anongit.freedesktop.org/xorg/xserver -b xwayland-1.12
+<pre>    git clone git://anongit.freedesktop.org/xorg/xserver -b xwayland
     cd xserver
     ./autogen.sh --prefix=$WLD
     make
     make install
     cd ..
 </pre>
+<p>This gets you the latest Wayland enabled X server, until the Wayland enablement
+gets merged into the master branch.</p>
 
 <h2>DDX</h2>
 
@@ -58,7 +60,7 @@
   The Device Dependent part of X.  Only one of these is necessary.
   xf86-video-intel works with Intel open source video drivers.
   xf86-video-ati works with AMD Radeon open source drivers.
-  xf86-video-wlshm is implemented in software, so it works on all
+  xf86-video-wayland is implemented in software, so it works on all
   hardware, but is somewhat less complete.  xf86-video-nouveau works
   with Nvidia / Nouveau.
 </p>
@@ -79,8 +81,8 @@
     cd ..
 </pre>
 
-<pre>    git clone git://people.freedesktop.org/~iksaif/xf86-video-wlshm
-    cd xf86-video-wlshm
+<pre>    git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-wayland
+    cd xf86-video-wayland
     ./autogen.sh --prefix=$WLD
     make
     make install
-- 
1.8.3.2