From b4d4de98d76e0e009ad0ce77e81a46fbf1a18569 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 17 Apr 2020 23:41:51 -0700 Subject: [PATCH] libevdev: update to 2.9.0 Converted to meson for compilation speed. Removed uClibc-ng patch as tests no longer get built. Small cleanups. Signed-off-by: Rosen Penev --- libs/libevdev/Makefile | 16 +++++++++++----- .../010-no-clock-monotonic-raw-in-uclibc.patch | 14 -------------- 2 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 libs/libevdev/patches/010-no-clock-monotonic-raw-in-uclibc.patch diff --git a/libs/libevdev/Makefile b/libs/libevdev/Makefile index 0ee832c92..a5f620c51 100644 --- a/libs/libevdev/Makefile +++ b/libs/libevdev/Makefile @@ -5,21 +5,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libevdev -PKG_VERSION:=1.6.0 +PKG_VERSION:=1.9.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libevdev/ -PKG_HASH:=f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814 +PKG_HASH:=e7e18a64264f2dea19b6c50a481f8c062529d42919ccda0bc861495bce28eb9e +PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Daniel Golle -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk +include ../../devel/meson/meson.mk define Package/libevdev SECTION:=libs @@ -37,11 +38,16 @@ define Package/libevdev/description evdev devices, thus making direct access unnecessary. endef +MESON_ARGS += \ + -Dtests=disabled \ + -Ddocumentation=disabled \ + -Dcoverity=false + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef diff --git a/libs/libevdev/patches/010-no-clock-monotonic-raw-in-uclibc.patch b/libs/libevdev/patches/010-no-clock-monotonic-raw-in-uclibc.patch deleted file mode 100644 index a11ac1e46..000000000 --- a/libs/libevdev/patches/010-no-clock-monotonic-raw-in-uclibc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/test/test-libevdev-init.c -+++ b/test/test-libevdev-init.c -@@ -32,6 +32,11 @@ - #include - #include "test-common.h" - -+/* work-around CLOCK_MONOTONIC_RAW definition missing in uClibc */ -+#ifndef CLOCK_MONOTONIC_RAW -+#define CLOCK_MONOTONIC_RAW 4 -+#endif -+ - START_TEST(test_new_device) - { - struct libevdev *dev;