On Thu, Feb 05, 2015 at 02:42:26PM -0800, Bill Spitzak wrote: > Uses the tar file from the sourceforge repository. This avoids use of cvs > which would otherwise have to be installed. > > The main purpose of this is to get a working pkg-config so the new > autoconf for wayland works, but since this updates from expat 1.6.0 > to 2.1.0 it seems like a good idea.
LGTM Reviewed-by: Bryce Harrington <[email protected]> Thanks, applied: 1f7e6fd..4248a08 master -> master > --- > ubuntu12.04.html | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/ubuntu12.04.html b/ubuntu12.04.html > index 805b35c..cc99064 100644 > --- a/ubuntu12.04.html > +++ b/ubuntu12.04.html > @@ -40,6 +40,14 @@ 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> > > +<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 > +cd .. > + > <span class="comment"># libwayland-*:</span> > git clone git://anongit.freedesktop.org/wayland/wayland > cd wayland > @@ -52,7 +60,7 @@ cd .. > # install unwanted items, such as wayland itself, and xcb prototypes > # that are too old.</span> > sudo apt-get install autoconf automake bison debhelper dpkg-dev flex \ > - libexpat1-dev libudev-dev libx11-dev libx11-xcb-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 > -- > 1.7.9.5 > > _______________________________________________ > wayland-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
