Bring tools up to date with XWayland current git dependencies

4 files changed, 151 insertions, 59 deletions

diff --git a/wl_build b/wl_build
index ae532d2..04f7c98 100755
--- a/wl_build
+++ b/wl_build
@@ -6,17 +6,25 @@ if [ ! -e $WLROOT ]; then
     exit 1
 fi
 
-export PATH=$PATH:${WLROOT}/install/bin
-
 # Bail if errors
 set -e
 
+gen() {
+	pkg=$1
+	shift
+	echo
+	echo $pkg
+	cd $WLROOT/$pkg
+	echo "./autogen.sh --prefix=$WLD $*"
+	./autogen.sh --prefix=$WLD $*
+}
+
 compile() {
-    make -j32 && make install
-    if [ $? != 0 ]; then
-	echo "Build Error.  Terminating"
-	exit
-    fi
+	make -j32 && make install
+	if [ $? != 0 ]; then
+		echo "Build Error.  Terminating"
+		exit
+	fi
 }
 
 # TODO: Check if tree doesn't exist
@@ -24,17 +32,35 @@ compile() {
 # TODO: If it's been a while since we last ran successfully, then
 #       delete $WLD
 
-echo
-echo "wayland"
 mkdir -p $WLD/share/aclocal
-cd $WLROOT/wayland
-./autogen.sh --prefix=$WLD
+
+gen wayland
 compile
 
-echo
-echo "drm"
-cd $WLROOT/drm
-./autogen.sh --prefix=$WLD --disable-libkms
+gen drm --disable-libkms
+compile
+
+gen proto
+compile
+
+gen macros
+compile
+
+gen libxcb
+compile
+
+gen presentproto
+compile
+
+gen dri3proto
+compile
+
+gen libxshmfence
+compile
+
+gen libxkbcommon \
+	--with-xkb-config-root=/usr/share/X11/xkb \
+    --disable-x11
 compile
 
 echo
@@ -44,26 +70,14 @@ git clean -xfd
 ./autogen.sh --prefix=$WLD --enable-gles2 --disable-gallium-egl --disable-dri3 \
     --disable-llvm-shared-libs --disable-opencl \
     --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi \
-    --with-gallium-drivers=r300,r600,swrast,nouveau
+    --with-gallium-drivers=swrast,nouveau
 compile
 
-echo
-echo "libxkbcommon"
-cd $WLROOT/libxkbcommon/
-./autogen.sh --prefix=$WLD --with-xkb-config-root=/usr/share/X11/xkb \
-    --disable-x11
-compile
 
-echo
-echo "pixman"
-cd $WLROOT/pixman
-./autogen.sh --prefix=$WLD
+gen pixman
 compile
 
-echo
-echo "cairo"
-cd $WLROOT/cairo
-./autogen.sh --prefix=$WLD --enable-gl --enable-xcb
+gen cairo --enable-gl --enable-xcb
 compile
 
 echo
@@ -73,29 +87,68 @@ autoreconf -i
 ./configure --prefix=$WLD
 compile
 
+gen libevdev
+compile
+
+gen libinput
+compile
+
 echo
 echo "weston"
 cd $WLROOT/weston
 git clean -xfd
-./autogen.sh --prefix=$WLD --with-cairo=gl --enable-setuid-install=no \
+./autogen.sh --prefix=$WLD \
+	--with-cairo=gl \
+	--enable-libinput-backend \
+	--enable-setuid-install=no \
 	--enable-clients \
-        --enable-headless-compositor \
+    --enable-headless-compositor \
 	--enable-demo-clients-install
 compile
 
 if [ ${INCLUDE_XWAYLAND} ]; then
 	if [ ${WL_BITS} = 32 ]; then
-		echo
-		echo "libxtrans"
-		cd $WLROOT/libxtrans
-		./autogen.sh --prefix=$WLD
+		gen libxtrans
 		compile
 	fi
 
-	echo
-	echo "libepoxy"
-	cd $WLROOT/libepoxy
-	./autogen.sh --prefix=$WLD
+	gen libepoxy
+	compile
+
+	gen glproto
+	compile
+
+	gen xproto
+	compile
+
+	gen xcmiscproto
+	compile
+
+	gen libxtrans
+	compile
+
+	gen bigreqsproto
+	compile
+
+	gen xextproto
+	compile
+
+	gen fontsproto
+	compile
+
+	gen videoproto
+	compile
+
+	gen recordproto
+	compile
+
+	gen resourceproto
+	compile
+
+	gen xf86driproto
+	compile
+
+	gen libxkbfile
 	compile
 
 	echo
diff --git a/wl_clone b/wl_clone
index a16015c..2e834d4 100755
--- a/wl_clone
+++ b/wl_clone
@@ -37,12 +37,19 @@ clone_or_update() {
 
 clone_or_update git://anongit.freedesktop.org/wayland/wayland
 clone_or_update git://anongit.freedesktop.org/git/mesa/drm
-clone_or_update git://anongit.freedesktop.org/mesa/mesa
+clone_or_update git://anongit.freedesktop.org/xcb/proto
+clone_or_update git://anongit.freedesktop.org/xorg/util/macros
 clone_or_update git://anongit.freedesktop.org/xcb/libxcb
+clone_or_update git://anongit.freedesktop.org/xorg/proto/presentproto
+clone_or_update git://anongit.freedesktop.org/xorg/proto/dri3proto
+clone_or_update git://anongit.freedesktop.org/xorg/lib/libxshmfence
 clone_or_update git://github.com/xkbcommon/libxkbcommon
+clone_or_update git://anongit.freedesktop.org/mesa/mesa
 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/libevdev
+clone_or_update git://anongit.freedesktop.org/wayland/libinput
 clone_or_update git://anongit.freedesktop.org/wayland/weston
 
 if [ ${INCLUDE_XWAYLAND} ]; then
@@ -50,6 +57,18 @@ if [ ${INCLUDE_XWAYLAND} ]; 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://github.com/anholt/libepoxy
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/glproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/xproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/xcmiscproto
+	clone_or_update git://anongit.freedesktop.org/xorg/lib/libxtrans
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/bigreqsproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/xextproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/fontsproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/videoproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/recordproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/resourceproto
+	clone_or_update git://anongit.freedesktop.org/xorg/proto/xf86driproto
+	clone_or_update git://anongit.freedesktop.org/xorg/lib/libxkbfile
 	clone_or_update git://anongit.freedesktop.org/xorg/xserver
 fi
diff --git a/wl_defines.sh b/wl_defines.sh
index 2d7145c..dc709fd 100644
--- a/wl_defines.sh
+++ b/wl_defines.sh
@@ -1,17 +1,17 @@
-INCLUDE_XWAYLAND=1
-WLROOT=$HOME/Wayland
-WLD=$WLROOT/install   # change this to another location if you prefer
+export INCLUDE_XWAYLAND=1
+export WLROOT=$HOME/Wayland
+export WLD=$WLROOT/install   # change this to another location if you prefer
 
 if [ "$(uname -i)" = "i386" ]; then
-	WL_BITS=32
+	export WL_BITS=32
 else
-	WL_BITS=64
+	export WL_BITS=64
 fi
 
-LD_LIBRARY_PATH=$WLD/lib
-PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/
-ACLOCAL_PATH="$WLD/share/aclocal"
-ACLOCAL="aclocal -I $ACLOCAL_PATH"
+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"
 
-export WLROOT WLD LD_LIBRARY_PATH PKG_CONFIG_PATH ACLOCAL ACLOCAL_PATH
 
diff --git a/wl_install_deps b/wl_install_deps
index 4ca0379..2c36f3c 100755
--- a/wl_install_deps
+++ b/wl_install_deps
@@ -2,13 +2,33 @@
 
 . ~/bin/wl_defines.sh
 
+# generic build dependencies for ubuntu
+sudo apt-get -y install autoconf automake bison debhelper dpkg-dev flex
+sudo apt-get -y install pkg-config quilt libudev-dev python-libxml2
+
+# wayland/weston specific stuff
 sudo apt-get -y install doxygen
-sudo apt-get -y install llvm
+sudo apt-get -y install linux-libc-dev
 sudo apt-get -y install libexpat1-dev
-sudo apt-get -y install libxcb-composite0-dev
-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
+sudo apt-get -y install libmtdev-dev
+sudo apt-get -y install libpam0g-dev
+
+sudo apt-get -y install llvm-3.1-dev
+sudo ln -sf llvm-config-3.1 /usr/bin/llvm-config
 
-	
\ No newline at end of file
+# xwayland specific stuff
+if [ ${INCLUDE_XWAYLAND} ]; then
+	sudo apt-get -y install libxcb-composite0-dev
+	sudo apt-get -y install x11proto-dri2-dev
+	sudo apt-get -y install x11proto-gl-dev
+	sudo apt-get -y install xutils-dev
+	sudo apt-get -y install libxcursor-dev
+	sudo apt-get -y install libdrm-dev
+	sudo apt-get -y install libx11-dev
+	sudo apt-get -y install libx11-xcb-dev
+    #sudo apt-get -y install x11proto-dri3-dev
+	sudo apt-get -y install libxdamage-dev
+	sudo apt-get -y install libxext-dev
+	sudo apt-get -y install libxfixes-dev
+	sudo apt-get -y install libxxf86vm-dev
+fi