libinput now uses the meson build system. Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> --- rules/libinput.in | 1 + rules/libinput.make | 27 +++++++++------------------ 2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/rules/libinput.in b/rules/libinput.in index 75f846451..0a39bbd25 100644 --- a/rules/libinput.in +++ b/rules/libinput.in @@ -2,6 +2,7 @@ config LIBINPUT tristate + select HOST_MESON select MTDEV select LIBEVDEV select UDEV diff --git a/rules/libinput.make b/rules/libinput.make index b64e235f7..4c5bb390f 100644 --- a/rules/libinput.make +++ b/rules/libinput.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBINPUT) += libinput # # Paths and names # -LIBINPUT_VERSION := 1.7.0 -LIBINPUT_MD5 := b6689bfacc1239082afd453216fc3d0e +LIBINPUT_VERSION := 1.9.3 +LIBINPUT_MD5 := 8136266444de2062e4cf2f02de40499b LIBINPUT := libinput-$(LIBINPUT_VERSION) LIBINPUT_SUFFIX := tar.xz LIBINPUT_URL := http://www.freedesktop.org/software/libinput/$(LIBINPUT).$(LIBINPUT_SUFFIX) @@ -29,23 +29,14 @@ LIBINPUT_LICENSE := MIT # Prepare # ---------------------------------------------------------------------------- -LIBINPUT_CONF_ENV := \ - $(CROSS_ENV) \ - ac_cv_path_DOXYGEN= -# -# autoconf -# -LIBINPUT_CONF_TOOL := autoconf +LIBINPUT_CONF_TOOL := meson LIBINPUT_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-documentation \ - --disable-event-gui \ - --disable-gcov \ - --disable-test-run \ - --disable-tests \ - --disable-libwacom \ - --without-libunwind \ - --with-udev-dir=/usr/lib/udev + $(CROSS_MESON_USR) \ + -Dudev-dir=/usr/lib/udev \ + -Dlibwacom=false \ + -Ddebug-gui=false \ + -Dtests=false \ + -Ddocumentation=false # ---------------------------------------------------------------------------- # Target-Install -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de