diff options
| -rwxr-xr-x | wl_build | 16 | ||||
| -rwxr-xr-x | wl_install_deps | 12 |
2 files changed, 25 insertions, 3 deletions
@@ -71,7 +71,7 @@ gen libxkbcommon \ --disable-x11 compile -llvm_drivers=swrast,nouveau,r300,r600 +llvm_drivers=swrast,nouveau,r300 vga_pci=$(lspci | grep VGA | head -n1) vga_name=${vga_pci#*controller: } vga_manu=${vga_name%% *} @@ -116,8 +116,17 @@ compile gen libwacom compile -gen libinput -compile +echo +echo libinput +cd $WLROOT/libinput +rm -rf $WLROOT/libinput/builddir/ +mkdir $WLROOT/libinput/builddir/ +echo "meson --prefix=$WLD builddir/" +meson --prefix=$WLD -Ddebug-gui=false builddir/ +ninja -C builddir/ +ninja -C builddir/ install +# sudo udevadm hwdb --update + if [ ${INCLUDE_XWAYLAND} ]; then if [ ${WL_BITS} = 32 ]; then @@ -128,6 +137,7 @@ if [ ${INCLUDE_XWAYLAND} ]; then gen xproto compile + rm -rf $WLROOT/libepoxy/m4 gen libepoxy compile diff --git a/wl_install_deps b/wl_install_deps index ea4b69b..455ec8a 100755 --- a/wl_install_deps +++ b/wl_install_deps @@ -1,11 +1,23 @@ #!/bin/bash +source /etc/lsb-release . $HOME/.config/wayland-build-tools/wl_defines.sh # generic build dependencies for ubuntu sudo apt-get -y install autoconf automake bison debhelper dpkg-dev flex libtool sudo apt-get -y install pkg-config quilt python-libxml2 +# libinput needs meson +if [ "$DISTRIB_CODENAME" = "xenial" ]; then + # Xenial (16.04) has a too-old meson + # So need to install from security.ubuntu.com + apt-get -y install ninja-build=1.7.1-1~ubuntu16.04.1 + apt-get -y install meson=0.40.1-1~ubuntu16.04.1 +else + sudo apt-get -y install meson + sudo apt-get -y install ninja +fi + # wayland/weston specific stuff sudo apt-get -y install xmlto sudo apt-get -y install doxygen |