From patchwork Sun Jun 7 18:11:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1304789 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VVBvsaD6; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49g4GV2nqnz9sRK for ; Mon, 8 Jun 2020 04:12:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C20602010E; Sun, 7 Jun 2020 18:11:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oUF-lR-KvrPJ; Sun, 7 Jun 2020 18:11:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 720EE20348; Sun, 7 Jun 2020 18:11:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 259BB1BF47E for ; Sun, 7 Jun 2020 18:11:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2278085D90 for ; Sun, 7 Jun 2020 18:11:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rXAKJ92FCWTO for ; Sun, 7 Jun 2020 18:11:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2473485D6C for ; Sun, 7 Jun 2020 18:11:54 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id p5so14955083wrw.9 for ; Sun, 07 Jun 2020 11:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3vl+JrFdaE8CyVxwOT1PdFXQIamus43FX88Yvmcua/0=; b=VVBvsaD62+onLbavRJBrL7YqNJzbZ+v9dNINk4dWE21fz+YG0sPYgWZqFRDlU43iOH Pv0KVS+RO38bP8z1lOcUthpl/EaRJOxFX0OaVQYKJ1+Gs+jniCXqE8WIyz4uZ5ggIqj2 4yZ/p4G5ybrMtXuM7x6anN3nhHIyYDfpWr2TsSDJ4k30OIzv2jIQ5W4YmC+IIr30brqD ET5CS4rn5iCw9QN4uuBULkr7y0oMJQoaX9WNgLOGEa0EaREYGMf91PGfo1DbRNKgGIDB htdXYJ660bh3w/p8PSZiHrsIqXdIHDCQu7rVsxQxv+SYoSWnVWm0hO+YBHbo8Pc/RCFQ iFtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3vl+JrFdaE8CyVxwOT1PdFXQIamus43FX88Yvmcua/0=; b=lEBLSsTykJamPd8oxKW1b7/skeKyHoAr9dDw3HxPtR5YaJFsm2IyT0/H/kGeigcz42 BNW7OfdY+oFSkeavs5GM2eAkSUX7vfSbISBn7NOw0eq946mRiIPR5zucQ6M2EfAVgVUw LygZYEPepMja56ve4Xg680lOF0umRPqsRaKuMMnX9v/rQ7IqD9ONGMCvYTJpKEaMySGc 6yUwWhNrRFO37hoR0EnYAbitMN0Eqss1L+8rtvWay3iUWAkzt8UsJEQAZiXUpngl0XRE Q8hWfV/gIkXWTRqMlxyeBiPKZIsPS0dAumKIZKemV/itB+iqnb2EUSVcknFQlmQYkUEg djPQ== X-Gm-Message-State: AOAM533oxSJUvxMZe7QePolI/umxGOy9zyI/M7qxvSlD6il/tjHK9dEg 4fEja8peaa0gVE1I/YyMrcwvQ28k X-Google-Smtp-Source: ABdhPJw6rZbZEKTASbZoB5BHo0HJ/WySHCvM7aPTPaHu+ALkBt/OZ4R6mwmuo+OyArkYyJRvuvaTvg== X-Received: by 2002:a5d:4d0d:: with SMTP id z13mr21166214wrt.220.1591553512339; Sun, 07 Jun 2020 11:11:52 -0700 (PDT) Received: from t450s.fritz.box (ip5b426f84.dynamic.kabel-deutschland.de. [91.66.111.132]) by smtp.gmail.com with ESMTPSA id c16sm6202846wml.45.2020.06.07.11.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 11:11:51 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Sun, 7 Jun 2020 20:11:17 +0200 Message-Id: <20200607181116.29433-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v1 1/1] package/brltty: fix input_event related compile failure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Thiery , Mario Lang Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add a patch to fix input_event time related compile failure. The problem is reported and fixed upstream. Fixes: http://autobuild.buildroot.net/results/7c5278c0ff2b2d8f88803e256803b31a75904efe/build-end.log ./system_linux.c: In function 'writeInputEvent': ./system_linux.c:962:23: error: 'struct input_event' has no member named 'time'; did you mean 'type'? gettimeofday(&event.time, NULL); ^~~~ type Signed-off-by: Heiko Thiery --- ...nput_event-time-related-compile-fail.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/brltty/0002-fix-input_event-time-related-compile-fail.patch diff --git a/package/brltty/0002-fix-input_event-time-related-compile-fail.patch b/package/brltty/0002-fix-input_event-time-related-compile-fail.patch new file mode 100644 index 0000000000..249d420ca9 --- /dev/null +++ b/package/brltty/0002-fix-input_event-time-related-compile-fail.patch @@ -0,0 +1,52 @@ +From 43390f9906a8c663872e0eab56c1173032d1bd6c Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Sun, 7 Jun 2020 12:58:38 +0200 +Subject: [PATCH] fix input_event time related compile fail + +./system_linux.c: In function 'writeInputEvent': +./system_linux.c:962:23: error: 'struct input_event' has no member named 'time'; did you mean 'type'? + gettimeofday(&event.time, NULL); + ^~~~ + type + +Signed-off-by: Heiko Thiery +--- + Programs/system_linux.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Programs/system_linux.c b/Programs/system_linux.c +index a97ee7ff6..77052d32f 100644 +--- a/Programs/system_linux.c ++++ b/Programs/system_linux.c +@@ -40,6 +40,14 @@ + #ifdef HAVE_LINUX_INPUT_H + #include + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#endif ++ ++#ifndef input_event_usec ++#define input_event_usec time.tv_usec ++#endif ++ + #include "kbd_keycodes.h" + + LINUX_KEY_MAP(xt00) = { +@@ -957,9 +965,12 @@ int + writeInputEvent (UinputObject *uinput, uint16_t type, uint16_t code, int32_t value) { + #ifdef HAVE_LINUX_UINPUT_H + struct input_event event; ++ struct timeval tv; + + memset(&event, 0, sizeof(event)); +- gettimeofday(&event.time, NULL); ++ gettimeofday(&tv, NULL); ++ event.input_event_sec = tv.tv_sec; ++ event.input_event_usec = tv.tv_usec; + event.type = type; + event.code = code; + event.value = value; +-- +2.20.1 +