On Sat, Mar 03, 2012 at 05:34:45PM +0100, Rodney Lorrimar wrote: > Hi Alberto, > > I have updated the wayland moduleset in jhbuild according to the latest > build instructions on the wayland website. This includes adding libxcb > from git and xorg dri2proto. A number of configure options were enabled > but the weston install-setuid option was disabled. > > Would you mind checking it and pushing it to git.gnome.org? > > And for the wayland list, I was also wondering whether the build > instructions could mention jhbuild because in my opinion it's quite a > convenient way to build everything.
That would be good. The web site is in git here: http://cgit.freedesktop.org/wayland/wayland-web/ feel free to submit a patch or send a pull request. thanks, Kristian > > > Cheers, > > Rodney > > -- >8 -- > Subject: [wayland] Update configure options according to latest build > instructions > > http://wayland.freedesktop.org/building.html > > Signed-off-by: Rodney Lorrimar <[email protected]> > --- > modulesets/other/wayland.modules | 40 +++++++++++++++++++++++++++++++------ > 1 files changed, 33 insertions(+), 7 deletions(-) > > diff --git a/modulesets/other/wayland.modules > b/modulesets/other/wayland.modules > index afcead1..5a8d795 100644 > --- a/modulesets/other/wayland.modules > +++ b/modulesets/other/wayland.modules > @@ -17,42 +17,61 @@ > href="git://anongit.freedesktop.org/git/xorg/lib"/> > <repository type="git" name="xorg-doc" default="yes" > href="git://anongit.freedesktop.org/git/xorg/doc"/> > + <repository type="git" name="xorg-xcb" default="yes" > + href="git://anongit.freedesktop.org/xcb"/> > > <autotools id="pixman"> > <branch repo="freedesktop"/> > </autotools> > > - <autotools id="cairo"> > + <autotools id="cairo" autogenargs="--enable-gl --enable-xcb"> > <branch repo="freedesktop"/> > <dependencies> > <dep package="pixman"/> > <dep package="mesa"/> > + <dep package="libxcb"/> > </dependencies> > </autotools> > > - <autotools id="drm"> > + <autotools id="libxcb"> > + <branch repo="xorg-xcb"/> > + </autotools> > + > + <autotools id="drm" autogenargs="--enable-nouveau-experimental-api"> > <branch repo="mesa"/> > </autotools> > > - <autotools id="mesa" skip-autogen="never"> > + <autotools id="mesa" skip-autogen="never" autogenargs="--enable-gles2 > --disable-gallium-egl --with-egl-platforms=x11,wayland,drm --enable-gbm > --enable-shared-glapi --with-gallium-drivers=i915"> > <branch repo="mesa"/> > <dependencies> > <dep package="drm"/> > <dep package="libX11"/> > + <dep package="xproto" /> > + <dep package="dri2proto" /> > <dep package="glproto"/> > </dependencies> > </autotools> > > - <autotools id="wayland"> > + <autotools id="wayland" autogenargs="--enable-nouveau-experimental-api"> > <branch repo="wayland"/> > + <dependencies> > + <dep package="libxkbcommon"/> > + </dependencies> > </autotools> > > - <autotools id="wayland-demos"> > + <autotools id="wayland-demos" autogenargs="--disable-setuid-install"> > + <branch repo="wayland"/> > + <dependencies> > + <dep package="wayland"/> > + <dep package="cairo"/> > + </dependencies> > + </autotools> > + > + <autotools id="weston" autogenargs="--disable-setuid-install"> > <branch repo="wayland"/> > <dependencies> > <dep package="wayland"/> > <dep package="cairo"/> > - <dep package="libxkbcommon"/> > </dependencies> > </autotools> > > @@ -71,6 +90,13 @@ > </dependencies> > </autotools> > > + <autotools id="dri2proto"> > + <branch repo="xorg-proto"/> > + <dependencies> > + <dep package="macros"/> > + </dependencies> > + </autotools> > + > <autotools id="kbproto"> > <branch repo="xorg-proto"/> > <dependencies> > @@ -91,7 +117,7 @@ > <branch repo="xorg-lib"/> > </autotools> > > - <autotools id="libxkbcommon" > > + <autotools id="libxkbcommon" > autogenargs="--with-xkb-config-root=/usr/share/X11/xkb"> > <branch repo="xorg-lib"/> > <dependencies> > <dep package="macros"/> > -- > 1.7.9.1 > > _______________________________________________ > 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
