On Fri, Mar 25, 2016 at 07:37:33PM -0700, [email protected] wrote: > From: Bill Spitzak <[email protected]> > > The Mint instructions have been tested, I had to guess at the Ubuntu12 > instructions as I no longer have that machine. > > v2: Use MAKEFLAGS instead of switches > Use & instead of & > Some rewording of Ubuntu instructions to point out they are old > > Signed-off-by: Bill Spitzak <[email protected]>
looks correct, but I only skimmed it. One comment, most unrelated: I prefer to use pushd/popd over cd .. and the like, it makes copy-pasting a lot safer and more reliable to dtrt in case of errors. Cheers, Peter > --- > building.html | 2 ++ > mint17.html | 58 > ++++++++++++++++++++++++++++++++++++-------------------- > ubuntu12.04.html | 31 ++++++++++++++++++------------ > 3 files changed, 58 insertions(+), 33 deletions(-) > > diff --git a/building.html b/building.html > index 7bfcd8b..b5a83dc 100644 > --- a/building.html > +++ b/building.html > @@ -238,6 +238,8 @@ $ cd .. > <a href="http://www.freedesktop.org/wiki/Software/libevdev/";>libevdev</a>, > this is in <a > href="http://cgit.freedesktop.org/libevdev";><code>git://anongit.freedesktop.org/libevdev</code></a></li> > > +<li><a href="https://sourceforge.net/projects/linuxwacom/";>libwacom</a> > source is in <code>git://git.code.sf.net/p/linuxwacom/libwacom</code></li> > + > <li><a href="http://xkbcommon.org/";>libxkbcommon</a> source is > in <a > href="http://github.com/xkbcommon/libxkbcommon";><code>git://github.com/xkbcommon/libxkbcommon</code></a>.</li> > </ul> > diff --git a/mint17.html b/mint17.html > index ae1c5a8..a1f8341 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 > @@ -29,26 +29,42 @@ export PATH=$WLD/bin:$PATH > export ACLOCAL_PATH=$WLD/share/aclocal > export ACLOCAL="aclocal -I $ACLOCAL_PATH" > mkdir -p $ACLOCAL_PATH > +export MAKEFLAGS="j9" <span class="comment"># or use your own flags</span> > > <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 > cd wayland > ./autogen.sh --prefix=$WLD > -make -j 9 && make install > +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 && 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</span> > +apt install libgudev-1.0-dev > +git clone git://git.code.sf.net/p/linuxwacom/libwacom > +cd libwacom > +make && make install > +cd .. > + > git clone git://anongit.freedesktop.org/wayland/libinput > cd libinput > ./autogen.sh --prefix=$WLD > -make -j 9 && make install > +make && make install > cd .. > > <span class="comment"># weston:</span> > @@ -60,7 +76,7 @@ apt install libegl1-mesa-dev libgles2-mesa-dev > libxcursor-dev libcairo2-dev \ > git clone git://anongit.freedesktop.org/wayland/weston > cd weston > ./autogen.sh --prefix=$WLD --disable-setuid-install > -make -j 9 && make install > +make && make install > cd .. > > <span class="comment"># X Server:</span> > @@ -71,91 +87,91 @@ apt install libgl1-mesa-dri-dev libgcrypt11-dev > libxkbfile-dev libxfont-dev \ > git clone git://anongit.freedesktop.org/xorg/util/macros > cd macros > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/xcmiscproto > cd xcmiscproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/lib/libxtrans > cd libxtrans > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/bigreqsproto > cd bigreqsproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/xproto > cd xproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/randrproto > cd randrproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/fontsproto > cd fontsproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/videoproto > cd videoproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/compositeproto > cd compositeproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/recordproto > cd recordproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/scrnsaverproto > cd scrnsaverproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/resourceproto > cd resourceproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/xf86driproto > cd xf86driproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/presentproto > cd presentproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/proto/xineramaproto > cd xineramaproto > ./autogen.sh --prefix=$WLD > -make && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/xorg/xserver > @@ -163,7 +179,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 && make install > cd .. > > <span class="comment"># Links needed so XWayland works:</span> > diff --git a/ubuntu12.04.html b/ubuntu12.04.html > index cc99064..a079b04 100644 > --- a/ubuntu12.04.html > +++ b/ubuntu12.04.html > @@ -15,13 +15,12 @@ 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> > - > -<p>Newer Linux distributions should require fewer things to be > -compiled from git.</p> > +<p>This is about the oldest version of Linux which can compile Weston. > +Newer Linux distributions should require fewer things to be compiled > +from git.</p> > > <p>Conversely, newer versions of the code, in particular Mesa, will > probably require more dependencies than shown here.</p> > @@ -32,20 +31,21 @@ export WLD=$HOME/install > export LD_LIBRARY_PATH=$WLD/lib > export PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/ > export PATH=$WLD/bin:$PATH > - > export ACLOCAL_PATH=$WLD/share/aclocal > export ACLOCAL="aclocal -I $ACLOCAL_PATH" > mkdir -p $ACLOCAL_PATH > +export MAKEFLAGS="j9" <span class="comment"># or use your own flags</span> > > <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 > tar xzf expat-2.1.0.tar.gz > cd expat-2.1.0 > ./configure --prefix=$WLD > -make && make install > +make && make install > cd .. > > <span class="comment"># libwayland-*:</span> > @@ -55,6 +55,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 && 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 > @@ -132,13 +139,13 @@ cd .. > git clone git://anongit.freedesktop.org/pixman > cd pixman > ./autogen.sh --prefix=$WLD > -make -j 9 && make install > +make && make install > cd .. > > git clone git://anongit.freedesktop.org/cairo > cd cairo > ./autogen.sh --prefix=$WLD --enable-xcb > -make -j 9 && make install > +make && make install > cd .. > > <span class="comment"># libinput dependencies:</span> > @@ -159,7 +166,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 .. > > @@ -175,7 +182,7 @@ cd .. > git clone git://anongit.freedesktop.org/wayland/weston > cd weston > ./autogen.sh --prefix=$WLD --disable-setuid-install > -make -j 9 && make install > +make && make install > cd .. > > <span class="comment"># XServer dependencies:</span> > -- > 1.9.1 > _______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
