From patchwork Thu Feb 9 05:55:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 725965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vJnP46Tdmz9ryr for ; Thu, 9 Feb 2017 16:55:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A09CF30F2C; Thu, 9 Feb 2017 05:55:32 +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 XweKd0h-oqiu; Thu, 9 Feb 2017 05:55:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9FB3230614; Thu, 9 Feb 2017 05:55:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C47931BFD86 for ; Thu, 9 Feb 2017 05:55:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C36C18A0BD for ; Thu, 9 Feb 2017 05:55:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NOXZp+gM8tZi for ; Thu, 9 Feb 2017 05:55:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6EBB58A0B8 for ; Thu, 9 Feb 2017 05:55:26 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 37C154402AD; Thu, 9 Feb 2017 07:55:23 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 9 Feb 2017 07:55:04 +0200 Message-Id: <4ee6b473200b8d56fd395391f706227a05c1fe00.1486619704.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.11.0 Cc: Martin Kepplinger Subject: [Buildroot] [PATCH v2] Revert "tslib: needs kernel headers 3.12" X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Martin Kepplinger This reverts commit 7c60211ce38273580f1f8bf5886771406f9899ca. tslib-1.4 removes this dependency. Add upstream patch that fixes input macros declaration for older kernels. The ts_uinput tool requires 3.6 headers; disable for older kernels. Signed-off-by: Martin Kepplinger [baruch: add tslib patch; disable ts_uinput] Signed-off-by: Baruch Siach --- v2: fix build using older kernel headers --- package/directfb/Config.in | 5 ++--- package/qt/Config.mouse.in | 5 ++--- package/qt5/qt5base/Config.in | 5 ++--- package/tslib/Config.in | 5 ++--- package/tslib/tslib.hash | 2 ++ package/tslib/tslib.mk | 5 +++++ package/x11r7/xdriver_xf86-input-tslib/Config.in | 5 ++--- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package/directfb/Config.in b/package/directfb/Config.in index 35c0309a6f36..b5521647772d 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -113,12 +113,11 @@ config BR2_PACKAGE_DIRECTFB_SERIALMOUSE config BR2_PACKAGE_DIRECTFB_TSLIB bool "enable touchscreen support" depends on !BR2_STATIC_LIBS # tslib - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # tslib default y select BR2_PACKAGE_TSLIB -comment "touchscreen support needs a toolchain w/ dynamic library, headers >= 3.12" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 +comment "touchscreen support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS config BR2_PACKAGE_DIRECTFB_GIF bool "enable GIF support" diff --git a/package/qt/Config.mouse.in b/package/qt/Config.mouse.in index f15f8d5f5681..11da956f62f6 100644 --- a/package/qt/Config.mouse.in +++ b/package/qt/Config.mouse.in @@ -13,10 +13,9 @@ config BR2_PACKAGE_QT_MOUSE_TSLIB bool "tslib" select BR2_PACKAGE_TSLIB depends on !BR2_STATIC_LIBS # tslib - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # tslib -comment "tslib support needs a toolchain w/ dynamic library, headers >= 3.12" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 +comment "tslib support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS config BR2_PACKAGE_QT_MOUSE_QVFB bool "qvfb" diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index e273caa7733f..f22e034b3086 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -278,12 +278,11 @@ config BR2_PACKAGE_QT5BASE_ICU config BR2_PACKAGE_QT5BASE_TSLIB bool "Enable Tslib support" depends on !BR2_STATIC_LIBS # dlopen - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # tslib select BR2_PACKAGE_TSLIB help This options enables the Tslib plugin -comment "tslib support needs a toolchain w/ dynamic library, headers >= 3.12" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 +comment "tslib support needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS endif diff --git a/package/tslib/Config.in b/package/tslib/Config.in index 366530143d15..bc5d7901888c 100644 --- a/package/tslib/Config.in +++ b/package/tslib/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_TSLIB bool "tslib" depends on !BR2_STATIC_LIBS # dlopen - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 help Tslib is a filtering layer for touchscreen panel events. https://github.com/kergoth/tslib -comment "tslib needs a toolchain w/ dynamic library, headers >= 3.12" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 +comment "tslib needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 6540ac89b39c..b731df290a68 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,2 +1,4 @@ # taken from https://github.com/kergoth/tslib/releases/tag/1.4 sha256 ad0373f1dbfda27caec92cb10421227f226c79d160488f1ac915585ba947741f tslib-1.4.tar.xz +# Locally computed +sha256 b76d25358d1e2bbcc88b0b225e8d71cd00a4795f6d17020bae270940b17d0825 02795c4fa8b842c6fc017e86b5e036466bd4d3ef.patch diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 5ea526e5700a..356c4c2d9264 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -10,8 +10,13 @@ TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL, LGPL TSLIB_LICENSE_FILES = COPYING +TSLIB_PATCH = https://github.com/kergoth/tslib/commit/02795c4fa8b842c6fc017e86b5e036466bd4d3ef.patch TSLIB_AUTORECONF = YES TSLIB_INSTALL_STAGING = YES TSLIB_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6),) +TSLIB_CONF_OPTS += --disable-tools +endif + $(eval $(autotools-package)) diff --git a/package/x11r7/xdriver_xf86-input-tslib/Config.in b/package/x11r7/xdriver_xf86-input-tslib/Config.in index 79b739686ec3..9c6e2961537c 100644 --- a/package/x11r7/xdriver_xf86-input-tslib/Config.in +++ b/package/x11r7/xdriver_xf86-input-tslib/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB bool "xf86-input-tslib" depends on !BR2_STATIC_LIBS # tslib - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # tslib select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XPROTO_XPROTO @@ -11,5 +10,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB http://www.ptxdist.org/software/xf86-input-tslib/index_en.html -comment "xf86-input-tslib needs a toolchain w/ dynamic library, headers >= 3.12" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 +comment "xf86-input-tslib needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS