[PATCH wayland-web 5/7] Added comments about dependencies after each build instruction

Fri May 23 18:54:37 PDT 2014

From: Bill Spitzak <wspitzak at oblong.com>

---
 building.html    |   84 +++++++++++++++++++++++++++++++++++++++---------------
 ubuntu12.04.html |    2 +-
 xserver.html     |   13 +++++++++
 3 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/building.html b/building.html
index 1a054a0..18de281 100644
--- a/building.html
+++ b/building.html
@@ -17,6 +17,10 @@ project is still very much a prototype.  When the instructions suggest to clone
 of course just add a remote and fetch instead, if you have a clone of
 that repo around already.</p>
 
+<p>Some help for figuring out how to fix dependency problems:
+<a href="http://who-t.blogspot.com.au/2014/05/configure-fails-with-no-package-foo.html">Configure
+fails with "No package 'foo' found" - and how to fix it</a>.</p>
+
 <h2>System-specific Directions</h2>
 
 <ul>
@@ -99,6 +103,12 @@ $ make && make install
 $ cd ..
 </pre>
 
+<ul>
+<li>You can avoid the doxygen dependency
+with <code>--disable-documentation</code>.</li>
+
+</ul>
+
 <h2>Mesa</h2>
 
 <p>Wayland uses the mesa EGL stack, and all extensions required to run
@@ -106,10 +116,6 @@ EGL on KMS are now upstream.  Wayland should work with any mesa
 release after 9.0, but in some cases extra functionality or
 optimization will only be available in more recent releases.</p>
 
-<p>To compile mesa you'll need a development package for libdrm.
-Other dependencies are development packages of xcb-dri2 and
-xcb-xfixes.</p>
-
 <pre>
 $ git clone git://anongit.freedesktop.org/mesa/mesa
 $ cd mesa
@@ -124,16 +130,38 @@ $ cd ..
 won't try to load the Gallium drivers directly.  The Gallium drivers will
 be built as DRI drivers, which the EGL loader will load just fine.</p>
 
-<p><a href="mesa-configure.html">Example mesa configure output.</a></p>
+<ul>
+<li><a href="mesa-configure.html">Example mesa configure output.</a></li>
+
+<li>You will probably need a development package for libdrm. This is
+available in <code>git://anongit.freedesktop.org/git/mesa/drm</code></li>
+
+<li>xcb-* dependencies can be fixed by compiling and installing
+<code>git://anongit.freedesktop.org/xcb/proto</code> and
+<code>git://anongit.freedesktop.org/xcb/libxcb</code>.</li>
+
+<li>presentproto and other *proto dependencies can be built from
+<code>git://anongit.freedesktop.org/xorg/proto/presentproto</code>, etc.</li>
+
+<li><code>--disable-dri3</code> may remove some annoying dependencies.</li>
+
+<li>You can remove the need for llvm by removing <code>r300</code>.
+However this will disable some parts of EGL such as shaders (?).</li>
+
+<li>If you plan to compile <a href="xserver.html">XWayland</a> you may
+want to install any dependencies it needs now. This is so Mesa
+uses the same header files as xwayland.
+</ul>
 
-<p>Note on Mesa build failures:  If you're not building in your Mesa git
-repo for the first time, the first thing to try is always "<code>git clean&nbps;-xfd</code>", and possibly deleting your $WLD directory, as Mesa requires
-this often.</p>
+<p>Note on Mesa build failures: If you're not building in your Mesa
+git repo for the first time, the first thing to try is always
+"<code>git clean -xfd</code>", and possibly deleting
+your <code>$WLD</code> directory, as Mesa requires this often.</p>
 
 <h2>libunwind</h2>
 
 <p>Weston requires libunwind v1.1 if you don't configure with
---disable-libunwind .</p>
+<code>--disable-libunwind</code> .</p>
 
 <pre>
 $ git clone git://git.sv.gnu.org/libunwind
@@ -157,6 +185,16 @@ $ make && make install
 $ cd ..
 </pre>
 
+<ul>
+<li>You probably need the development package for evdev, this is in
+<code>git://anongit.freedesktop.org/libevdev</code></li>
+
+<li>libxkbcommon source is
+in <code>git://github.com/xkbcommon/libxkbcommon</code>.  You must
+add <code>--with-xkb-config-root=/usr/share/X11/xkb</code> to the
+autogen line if installing locally.</li>
+</ul>
+
 <h2><code>$XDG_RUNTIME_DIR</code></h2>
 
 <p>Weston creates its unix socket file (for example, wayland-0)
@@ -212,18 +250,6 @@ fi
 It's available in the weston repo and comes with a few demo
 applications.
 
-<p>Aside from mesa and libxkbcommon, the Weston dependencies can be
-satisfied with released versions of:
-
-gdk-pixbuf-2.0,
-libudev 136,
-libdrm 2.4.23,
-pixman-1,
-cairo-gl 1.11.3,
-glib-2.0, and
-gobject-2.0.  
-</p>
-
 <pre>
 $ git clone git://anongit.freedesktop.org/wayland/weston
 $ cd weston
@@ -232,10 +258,22 @@ $ make && make install
 $ cd ..
 </pre>
 
+<ul>
+<li>pam should be installed for your system, not compiled from source.</li>
+</ul>
+
+<p>Copy the <code>weston.ini</code> file and
+edit it to set a background image that you like:</p>
+
+<pre>
+$ mkdir -p ~/.config
+$ cp weston/weston.ini ~/.config
+$ $EDITOR ~/.config/weston.ini
+</pre>
+
 <p>If DISPLAY is set, the weston will run under X in a window and take
 input from X.  Otherwise it will run on the KMS framebuffer and take input
-from evdev devices.  Copy the weston.ini config file to ~/.config and
-edit it to set a background image that you like.  Then run the compositor
+from evdev devices. Run the compositor
 by typing:</p>
 
 <pre>
diff --git a/ubuntu12.04.html b/ubuntu12.04.html
index 8fe35fe..7463448 100644
--- a/ubuntu12.04.html
+++ b/ubuntu12.04.html
@@ -52,7 +52,7 @@ cd ..
 # install unwanted items, such as wayland itself, and xcb prototypes
 # that are too old.</font>
 sudo apt-get install autoconf automake bison debhelper dpkg-dev flex \
-  libdrm-dev libexpat1-dev libudev-dev libx11-dev libx11-xcb-dev \
+  libexpat1-dev libudev-dev libx11-dev libx11-xcb-dev \
   libxdamage-dev libxext-dev libxfixes-dev libxxf86vm-dev \
   linux-libc-dev pkg-config python-libxml2 quilt x11proto-dri2-dev \
   x11proto-gl-dev xutils-dev
diff --git a/xserver.html b/xserver.html
index a92676b..8e84671 100644
--- a/xserver.html
+++ b/xserver.html
@@ -66,6 +66,19 @@ $ make && make install
 $ cd ..
 </pre>
 
+<ul>
+<li>glproto, xproto, etc are available
+from <code>git://anongit.freedesktop.org/xorg/proto/glproto</code>,
+etc.</li>
+
+<li>libxtrans is
+in <code>git://anongit.freedesktop.org/xorg/lib/libxtrans</code>.</li>
+
+<li>libxkbfile is in
+in <code>git://anongit.freedesktop.org/xorg/lib/libxkbfile</code>.</li>
+
+</ul>
+
 <h2>Paths</h2>
 
 <p>
-- 
1.7.9.5

