Hello, I'm installing wayland from scratch and I encountered some problems while following the build instructions so I'm sending 2 patches to fix them.
The git repo is htp://cgit.freedesktop.org/wayland/wayland-web. Regards, Iskren
From e869ce179f635c5c0a44af4ead3ca32a660744f7 Mon Sep 17 00:00:00 2001 From: Iskren Chernev <[email protected]> Date: Sun, 6 Mar 2011 20:48:51 +0200 Subject: [PATCH 2/2] Moved macros build at the top of libxkbcommon. xproto depends on xorg/util/macros, so the macros should be intalled first. --- building.html | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/building.html b/building.html index 905fb0a..0594a8f 100644 --- a/building.html +++ b/building.html @@ -100,18 +100,18 @@ be built as DRI drivers, which the EGL loader will load just fine.</p> keysyms. For this you'll need development packages for xproto, kbproto, macros and libX11.</p> -<pre> $ git clone git://anongit.freedesktop.org/xorg/proto/xproto - $ cd xproto +<pre> $ git clone git://anongit.freedesktop.org/xorg/util/macros + $ cd macros $ ./autogen.sh --prefix=$WLD $ make && make install - $ git clone git://anongit.freedesktop.org/xorg/proto/kbproto - $ cd kbproto + $ git clone git://anongit.freedesktop.org/xorg/proto/xproto + $ cd xproto $ ./autogen.sh --prefix=$WLD $ make && make install - $ git clone git://anongit.freedesktop.org/xorg/util/macros - $ cd macros + $ git clone git://anongit.freedesktop.org/xorg/proto/kbproto + $ cd kbproto $ ./autogen.sh --prefix=$WLD $ make && make install -- 1.7.4
From 43276313e8eb402394f685701e32dc2b5ce331b9 Mon Sep 17 00:00:00 2001 From: Iskren Chernev <[email protected]> Date: Sun, 6 Mar 2011 21:12:23 +0200 Subject: [PATCH 1/2] Changed environment configuration -- installation directory in separate variable WLD -- changed all $HOME/install to $WLD -- export all variables -- added PKG_CONFIG_ALLOW_SYSTEM_CFLAGS because pkg-config was skipping some of the wayland include directories --- building.html | 57 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/building.html b/building.html index 33fd5fb..905fb0a 100644 --- a/building.html +++ b/building.html @@ -14,12 +14,11 @@ building and running experimental software. And be prepared that this project isn't at all useful right now, it's still very much a prototype. When the instructions suggest to clone a git repo, you can -of course just add a remote and fetch instead, if you have a clone of -that repo around already. I usually install all software I'm working -on into $HOME/install, so that's what I'll use in the instructions -below, but you can use your favorite directory of course or install -over your system copy (pass --prefix=/usr --sysconfdir=/etc, -generally).</p> +of course just add a remote and fetch instead, if you have a clone of that +repo around already. By default the software is installed in $HOME/install +but you can change it by altering $WLD (explained later). You can also install +everything system wide by setting WLD to /usr and passing --sysconfdir=/etc +to autogen.sh.</p> <h2>Hardware / Drivers</h2> @@ -39,18 +38,24 @@ requires a kernel built from the Nouveau git repository, details below. Cards probably work back to Riva TNT (1998).</p> <h2>Setting up the environment</h2> -<p>If you want to install in $HOME/install (or another location that won't -interfere with the rest of your system) you'll need to set the following -environment variables to get various libraries to link appropriately:</p> - -<pre>LD_LIBRARY_PATH=$HOME/install/lib -PKG_CONFIG_PATH=$HOME/install/lib/pkgconfig/:$HOME/install/share/pkgconfig/ -ACLOCAL="aclocal -I $HOME/install/share/aclocal" -C_INCLUDE_PATH=$HOME/install/include -LIBRARY_PATH=$HOME/install/lib +<p>If you want to install in a custom location (not system wide), you'll need +to set the following environment variables to get various libraries to link +appropriately:</p> + +<pre>WLD=$HOME/install # change this to another location if you prefer +LD_LIBRARY_PATH=$WLD/lib +PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/ +ACLOCAL="aclocal -I $WLD/share/aclocal" +C_INCLUDE_PATH=$WLD/include +LIBRARY_PATH=$WLD/lib +PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + +export WLD LD_LIBRARY_PATH PKG_CONFIG_PATH ACLOCAL C_INCLUDE_PATH \ + LIBRARY_PATH PKG_CONFIG_ALLOW_SYSTEM_CFLAGS </pre> <p>Do not set LD_LIBRARY_PATH as your default, it will break things.</p> +<p>You may put the above in a script and source it in the terminal you wish to build the packages.</p> <h2>Wayland libraries</h2> @@ -58,7 +63,7 @@ LIBRARY_PATH=$HOME/install/lib <pre> $ git clone git://anongit.freedesktop.org/wayland/wayland $ cd wayland - $ ./autogen.sh --prefix=$HOME/install + $ ./autogen.sh --prefix=$WLD $ make $ make install </pre> @@ -73,12 +78,12 @@ package for libdrm.</p> <pre> $ git clone git://anongit.freedesktop.org/git/mesa/drm $ cd drm - $ ./autogen.sh --prefix=$HOME/install --enable-nouveau-experimental-api + $ ./autogen.sh --prefix=$WLD --enable-nouveau-experimental-api $ make && make install $ git clone git://anongit.freedesktop.org/mesa/mesa $ cd mesa - $ ./autogen.sh --prefix=$HOME/install --enable-gles2 \ + $ ./autogen.sh --prefix=$WLD --enable-gles2 \ --disable-gallium-egl --enable-gallium-nouveau --enable-gallium-r600 \ --with-egl-platforms=wayland,drm $ make && make install @@ -97,27 +102,27 @@ kbproto, macros and libX11.</p> <pre> $ git clone git://anongit.freedesktop.org/xorg/proto/xproto $ cd xproto - $ ./autogen.sh --prefix=$HOME/install + $ ./autogen.sh --prefix=$WLD $ make && make install $ git clone git://anongit.freedesktop.org/xorg/proto/kbproto $ cd kbproto - $ ./autogen.sh --prefix=$HOME/install + $ ./autogen.sh --prefix=$WLD $ make && make install $ git clone git://anongit.freedesktop.org/xorg/util/macros $ cd macros - $ ./autogen.sh --prefix=$HOME/install + $ ./autogen.sh --prefix=$WLD $ make && make install $ git clone git://anongit.freedesktop.org/xorg/lib/libX11 $ cd libX11 - $ ./autogen.sh --prefix=$HOME/install + $ ./autogen.sh --prefix=$WLD $ make && make install $ git clone git://people.freedesktop.org/xorg/lib/libxkbcommon.git $ cd libxkbcommon/ - $ ./autogen.sh --prefix=$HOME/install --with-xkb-config-root=/usr/share/X11/xkb + $ ./autogen.sh --prefix=$WLD --with-xkb-config-root=/usr/share/X11/xkb $ make && make install </pre> @@ -132,12 +137,12 @@ package for pixman.</p> <pre> $ git clone git://anongit.freedesktop.org/pixman $ cd pixman - $ ./autogen.sh --prefix=$HOME/install + $ ./autogen.sh --prefix=$WLD $ make && make install $ git clone git://anongit.freedesktop.org/cairo $ cd cairo - $ ./autogen.sh --prefix=$HOME/install --enable-gl --enable-xcb + $ ./autogen.sh --prefix=$WLD --enable-gl --enable-xcb $ make && make install </pre> @@ -150,7 +155,7 @@ glib-2.0, gdk-2.0 (for poppler) and poppler-glib.</p> <pre> $ git clone git://anongit.freedesktop.org/wayland/wayland-demos $ cd wayland-demos - $ ./autogen.sh --prefix=$HOME/install + $ ./autogen.sh --prefix=$WLD $ make $ make install </pre> -- 1.7.4
_______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
