[PATCH wayland-web] Updated build instructions for wayland-protocols and libwacom

[spitzak at gmail.com]

From: Bill Spitzak <spitzak at gmail.com>

The Mint instructions have been tested, I had to guess at the Ubuntu12
instructions as I no longer have that machine.
---
 mint17.html      | 21 ++++++++++++++++++---
 ubuntu12.04.html | 13 +++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/mint17.html b/mint17.html
index ae1c5a8..f32ef9e 100644
--- a/mint17.html
+++ b/mint17.html
@@ -12,7 +12,7 @@
 Building Weston on Linux Mint 17</h1>
 
 <p>The following sequence of commands successfully built Weston and
-XWayland on a Linux Mint 17 Cinnamon system, on October 28 2014. These
+XWayland on a Linux Mint 17.3 Cinnamon system, on March 2, 2016. These
 commands will probably work on any system based on Ubuntu 14.04.</p>
 
 <p>This is considerably easier than earlier systems as the distributed
@@ -32,7 +32,7 @@ mkdir -p $ACLOCAL_PATH
 
 <span class="comment"># libwayland:</span>
 
-apt install libffi-dev libexpat-dev
+apt install libffi-dev libexpat-dev libxml2-dev
 apt install doxygen xmlto <span class="comment"># or use --disable-documentation</span>
 
 git clone git://anongit.freedesktop.org/wayland/wayland
@@ -41,10 +41,25 @@ cd wayland
 make -j 9 && make install
 cd ..
 
+<span class="comment"># wayland-protocols:</span>
+
+git clone git://anongit.freedesktop.org/wayland/wayland-protocols
+cd wayland-protocols
+./autogen.sh --prefix=$WLD
+make -j 9 && make install
+cd ..
+
 <span class="comment"># libinput:</span>
 
 apt install libmtdev-dev libudev-dev libevdev-dev
 
+<span class="comment"># newer version of libwacom is needed than in apt
+apt install libgudev-1.0-dev
+git clone git://git.code.sf.net/p/linuxwacom/libwacom
+cd libwacom
+make -j 9 && make install
+cd ..
+
 git clone git://anongit.freedesktop.org/wayland/libinput
 cd libinput
 ./autogen.sh --prefix=$WLD
@@ -163,7 +178,7 @@ cd xserver
 ./autogen.sh --prefix=$WLD --disable-docs --disable-devel-docs \
   --enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \
   --disable-xquartz --disable-xwin
-make && make install
+make -j 9 && make install
 cd ..
 
 <span class="comment"># Links needed so XWayland works:</span>
diff --git a/ubuntu12.04.html b/ubuntu12.04.html
index cc99064..9b4c812 100644
--- a/ubuntu12.04.html
+++ b/ubuntu12.04.html
@@ -15,7 +15,8 @@ Building Weston on Ubuntu 12.04</h1>
 XWayland on an Ubuntu 12.04 LTS system, on October 29 2014. This system had
 previously been used to compile Xlib programs, and thus already had
 some dependencies (such as git, the compiler, and X11 header files)
-installed.</p>
+installed. The commands have been updated for recent versions of
+Wayland but not tested.</p>
 
 <p>Parallel make (<code>make -j 9</code>) will probably work on all
 packages but only the ones shown were compiled this way.</p>
@@ -39,6 +40,7 @@ mkdir -p $ACLOCAL_PATH
 
 <span class="comment"># dependencies for libwayland:</span>
 sudo apt-get install doxygen xmlto <span class="comment"># or use --disable-documentation</span>
+sudo apt-get install libxml2-dev
 
 <span class="comment"># expat with pkg-config needed for libwayland:</span>
 wget http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz
@@ -55,6 +57,13 @@ cd wayland
 make && make install
 cd ..
 
+<span class="comment"># wayland-protocols:</span>
+git clone git://anongit.freedesktop.org/wayland/wayland-protocols
+cd wayland-protocols
+./autogen.sh --prefix=$WLD
+make -j9 && make install
+cd ..
+
 <span class="comment"># dependencies for Mesa:
 # "sudo apt-get build-dep mesa" will install these, but will also
 # install unwanted items, such as wayland itself, and xcb prototypes
@@ -159,7 +168,7 @@ cd ..
 <span class="comment"># libinput:</span>
 git clone git://anongit.freedesktop.org/wayland/libinput
 cd libinput
-./autogen.sh --prefix=$WLD
+./autogen.sh --prefix=$WLD --disable-libwacom
 make && make install
 cd ..
 
-- 
1.9.1