It may be necessary to build libxtrans from xserver on 32-bit systems.

5 files changed, 52 insertions, 2 deletions

diff --git a/wl_build b/wl_build
index 8e733bb..ae532d2 100755
--- a/wl_build
+++ b/wl_build
@@ -82,5 +82,35 @@ git clean -xfd
         --enable-headless-compositor \
 	--enable-demo-clients-install
 compile
-cd $WLROOT
 
+if [ ${INCLUDE_XWAYLAND} ]; then
+	if [ ${WL_BITS} = 32 ]; then
+		echo
+		echo "libxtrans"
+		cd $WLROOT/libxtrans
+		./autogen.sh --prefix=$WLD
+		compile
+	fi
+
+	echo
+	echo "libepoxy"
+	cd $WLROOT/libepoxy
+	./autogen.sh --prefix=$WLD
+	compile
+
+	echo
+	echo "xserver"
+	cd $WLROOT/xserver
+	./autogen.sh --prefix=$WLD --disable-docs --disable-devel-docs \
+		--enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \
+		--disable-xquartz --disable-xwin
+	compile
+
+	echo
+	echo "Paths"
+	mkdir -p $WLD/share/X11/xkb/rules
+    ln -s /usr/share/X11/xkb/rules/evdev $WLD/share/X11/xkb/rules/
+    ln -s /usr/bin/xkbcomp $WLD/bin/
+fi
+
+cd $WLROOT
diff --git a/wl_clone b/wl_clone
index 872a91e..a16015c 100755
--- a/wl_clone
+++ b/wl_clone
@@ -7,7 +7,6 @@
 # TODO: Log output
 
 
-
 clone_or_update() {
     repo=$1
     dest=$(basename $repo)
@@ -45,3 +44,12 @@ clone_or_update git://anongit.freedesktop.org/pixman
 clone_or_update git://anongit.freedesktop.org/cairo
 clone_or_update git://git.sv.gnu.org/libunwind
 clone_or_update git://anongit.freedesktop.org/wayland/weston
+
+if [ ${INCLUDE_XWAYLAND} ]; then
+	if [ ${WL_BITS} = "32" ]; then
+		clone_or_update git://anongit.freedesktop.org/xorg/lib/libxtrans
+	fi
+
+	clone_or_update https://github.com/anholt/libepoxy.git
+	clone_or_update git://anongit.freedesktop.org/xorg/xserver
+fi
diff --git a/wl_defines.sh b/wl_defines.sh
index 718e0c6..2d7145c 100644
--- a/wl_defines.sh
+++ b/wl_defines.sh
@@ -2,6 +2,12 @@ INCLUDE_XWAYLAND=1
 WLROOT=$HOME/Wayland
 WLD=$WLROOT/install   # change this to another location if you prefer
 
+if [ "$(uname -i)" = "i386" ]; then
+	WL_BITS=32
+else
+	WL_BITS=64
+fi
+
 LD_LIBRARY_PATH=$WLD/lib
 PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/
 ACLOCAL_PATH="$WLD/share/aclocal"
diff --git a/wl_install_deps b/wl_install_deps
index 820651b..4ca0379 100755
--- a/wl_install_deps
+++ b/wl_install_deps
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. ~/bin/wl_defines.sh
+
 sudo apt-get -y install doxygen
 sudo apt-get -y install llvm
 sudo apt-get -y install libexpat1-dev
@@ -8,3 +10,5 @@ sudo apt-get -y install x11proto-dri2-dev
 #sudo apt-get -y install x11proto-dri3-dev
 sudo apt-get -y install libxcursor-dev
 sudo apt-get -y build-dep mesa
+
+	
\ No newline at end of file
diff --git a/wl_patch_check b/wl_patch_check
index 6ab15df..6927c30 100755
--- a/wl_patch_check
+++ b/wl_patch_check
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. ~/bin/wl_defines.sh
+
 ## == Code Review ==
 ## Is the code correct?
 ## Does it fix the problem that it proposed to fix? Or does it successfully