From 13ea4634e74bb3471d8ebee3e471a8c6b1e23b03 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 16 Sep 2015 00:33:07 -0700 Subject: [PATCH 1/2] [libinput] update to version 1.0.1 --- packages/wayland/libinput/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wayland/libinput/package.mk b/packages/wayland/libinput/package.mk index 3a70f9f1f6..3ab9baeb36 100644 --- a/packages/wayland/libinput/package.mk +++ b/packages/wayland/libinput/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libinput" -PKG_VERSION="0.21.0" +PKG_VERSION="1.0.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 91392ac0cc3638607e6eca58731e728018f7738f Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 16 Sep 2015 00:35:36 -0700 Subject: [PATCH 2/2] [virtual/x11] allow building with xf86-input-libinput instead of xf86-input-evdev --- packages/virtual/x11/package.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/virtual/x11/package.mk b/packages/virtual/x11/package.mk index 18e3322681..f3e616ca41 100644 --- a/packages/virtual/x11/package.mk +++ b/packages/virtual/x11/package.mk @@ -47,8 +47,14 @@ if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then fi get_graphicdrivers -# Drivers + +# Drivers +if [ -n $LIBINPUT ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-libinput" +else PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-evdev" - for drv in $XORG_DRIVERS; do - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-video-$drv" - done +fi + +for drv in $XORG_DRIVERS; do + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-video-$drv" +done