summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2015-05-04 18:44:43 -0700
committerBryce Harrington <bryce@osg.samsung.com>2015-05-04 18:44:43 -0700
commit21efe7dc8ac9efeaa16229a770fd017154c96497 (patch)
treeaf972ab8d2bac12ff209b79e295233de9cc98ce8
parentcf5e3267e0ccc9db28e2df818569ae9a16447d44 (diff)
Add randrproto, since xserver now requires version 5
-rwxr-xr-xwl_build5
-rwxr-xr-xwl_clone19
2 files changed, 14 insertions, 10 deletions
diff --git a/wl_build b/wl_build
index 84f64ce..505436f 100755
--- a/wl_build
+++ b/wl_build
@@ -142,6 +142,9 @@ if [ ${INCLUDE_XWAYLAND} ]; then
gen xf86driproto
compile
+ gen randrproto
+ compile
+
gen libxkbfile
compile
@@ -176,6 +179,6 @@ git clean -xfd
--enable-headless-compositor \
--enable-demo-clients-install
compile
-distcheck
+#distcheck
cd $WLROOT
diff --git a/wl_clone b/wl_clone
index 2e834d4..3342d94 100755
--- a/wl_clone
+++ b/wl_clone
@@ -15,22 +15,22 @@ clone_or_update() {
echo
echo $dest
if [ ! -d ${dest} ]; then
- git clone ${repo}
- if [ $? != 0 ]; then
- echo "Error: Could not clone repository"
- exit 1
- fi
+ git clone ${repo} ${dest}
+ if [ $? != 0 ]; then
+ echo "Error: Could not clone repository"
+ exit 1
+ fi
fi
cd ${dest}
git checkout master
if [ $? != 0 ]; then
- echo "Error: Problem checking out master"
- exit 1
+ echo "Error: Problem checking out master"
+ exit 1
fi
git pull
if [ $? != 0 ]; then
- echo "Error: Could not pull from upstream"
- exit 1
+ echo "Error: Could not pull from upstream"
+ exit 1
fi
cd ${WLROOT}
}
@@ -69,6 +69,7 @@ if [ ${INCLUDE_XWAYLAND} ]; then
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/proto/randrproto
clone_or_update git://anongit.freedesktop.org/xorg/lib/libxkbfile
clone_or_update git://anongit.freedesktop.org/xorg/xserver
fi