Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,77 +0,0 @@
|
||||
From bf4a4a4e2b0479322fe16c9e1f15f146daa893ee Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@openwide.fr>
|
||||
Date: Thu, 21 Aug 2014 18:18:16 +0200
|
||||
Subject: [PATCH] rename log_msg to libinput_log_msg
|
||||
|
||||
This fixes a conflict between libevdev and libinput on the definition
|
||||
of the log_msg() symbol.
|
||||
|
||||
http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
[yann.morin.1998@free.fr: rebase on-top of 0.6.0]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
[ps.report@gmx.net: rebase on top of 0.7.0]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/libinput-private.h | 14 +++++++-------
|
||||
src/libinput.c | 2 +-
|
||||
2 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/libinput-private.h b/src/libinput-private.h
|
||||
index b36dc95..98f91b3 100644
|
||||
--- a/src/libinput-private.h
|
||||
+++ b/src/libinput-private.h
|
||||
@@ -259,12 +259,12 @@
|
||||
|
||||
typedef void (*libinput_source_dispatch_t)(void *data);
|
||||
|
||||
-#define log_debug(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
|
||||
-#define log_info(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
|
||||
-#define log_error(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
|
||||
-#define log_bug_kernel(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
|
||||
-#define log_bug_libinput(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__)
|
||||
-#define log_bug_client(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__)
|
||||
+#define log_debug(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
|
||||
+#define log_info(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
|
||||
+#define log_error(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
|
||||
+#define log_bug_kernel(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
|
||||
+#define log_bug_libinput(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__)
|
||||
+#define log_bug_client(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__)
|
||||
|
||||
#define log_debug_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
|
||||
#define log_info_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
|
||||
@@ -281,7 +281,7 @@
|
||||
LIBINPUT_ATTRIBUTE_PRINTF(4, 5);
|
||||
|
||||
void
|
||||
-log_msg(struct libinput *libinput,
|
||||
+libinput_log_msg(struct libinput *libinput,
|
||||
enum libinput_log_priority priority,
|
||||
const char *format, ...)
|
||||
LIBINPUT_ATTRIBUTE_PRINTF(3, 4);
|
||||
diff --git a/src/libinput.c b/src/libinput.c
|
||||
index 279cce0..5748e5e 100644
|
||||
--- a/src/libinput.c
|
||||
+++ b/src/libinput.c
|
||||
@@ -155,7 +155,7 @@
|
||||
}
|
||||
|
||||
void
|
||||
-log_msg(struct libinput *libinput,
|
||||
+libinput_log_msg(struct libinput *libinput,
|
||||
enum libinput_log_priority priority,
|
||||
const char *format, ...)
|
||||
{
|
||||
@@ -184,7 +184,7 @@
|
||||
va_end(args);
|
||||
|
||||
if (state == RATELIMIT_THRESHOLD)
|
||||
- log_msg(libinput,
|
||||
+ libinput_log_msg(libinput,
|
||||
priority,
|
||||
"WARNING: log rate limit exceeded (%d msgs per %dms). Discarding future messages.\n",
|
||||
ratelimit->burst,
|
||||
--
|
||||
2.1.2
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://lists.freedesktop.org/archives/wayland-devel/2016-January/026701.html
|
||||
sha256 5e08c45dbb8bf32490cc6cd626da098564d646d161a07cba2e3adbd9745c0622 libinput-1.1.5.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2016-July/030121.html
|
||||
sha256 76ef10874519d1a67b57e5c68ede06106b9fbf611a3ecf69c84886107c67b420 libinput-1.4.0.tar.xz
|
||||
|
||||
@@ -4,16 +4,21 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBINPUT_VERSION = 1.1.5
|
||||
LIBINPUT_VERSION = 1.4.0
|
||||
LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
|
||||
LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
|
||||
LIBINPUT_LICENSE = MIT
|
||||
LIBINPUT_LICENSE_FILES = COPYING
|
||||
|
||||
LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev
|
||||
LIBINPUT_INSTALL_STAGING = YES
|
||||
|
||||
LIBINPUT_LICENSE = MIT
|
||||
LIBINPUT_LICENSE_FILES = COPYING
|
||||
# Tests need fork, so just disable them everywhere.
|
||||
LIBINPUT_CONF_OPTS = --disable-tests
|
||||
LIBINPUT_CONF_OPTS = --disable-tests --disable-libwacom
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGTK3),y)
|
||||
LIBINPUT_CONF_OPTS += --enable-event-gui
|
||||
LIBINPUT_DEPENDENCIES += libgtk3
|
||||
else
|
||||
LIBINPUT_CONF_OPTS += --disable-event-gui
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user