diff mbox

[v2] tslib: bump to 1.4

Message ID 1486460873-30025-1-git-send-email-martin.kepplinger@ginzinger.com
State Superseded
Headers show

Commit Message

Martin Kepplinger Feb. 7, 2017, 9:47 a.m. UTC 
The update to 1.4, besides the version bump, includes
 * removing the patch fixing missing headers (upstream)
 * removing the dependency on 3.12 headers
 * a small change in the package description

Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com>
---
 ...01-tests-ts_calibrate-add-missing-headers.patch | 35 ----------------------
 package/tslib/Config.in                            |  7 ++---
 package/tslib/tslib.hash                           |  4 +--
 package/tslib/tslib.mk                             |  2 +-
 4 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch

Comments

Baruch Siach Feb. 7, 2017, 10:14 a.m. UTC | #1 
Hi Martin,

On Tue, Feb 07, 2017 at 10:47:53AM +0100, Martin Kepplinger wrote:
> The update to 1.4, besides the version bump, includes
>  * removing the patch fixing missing headers (upstream)
>  * removing the dependency on 3.12 headers

You should update also tslib reverse dependencies.

I suggest to leave the kernel version dependency removal out of this patch, 
and add a separate revert of 7c60211ce382 instead.

>  * a small change in the package description
> 
> Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com>

baruch
diff mbox

Patch

diff --git a/package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch b/package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch
deleted file mode 100644
index 97cd4be..0000000
--- a/package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From 54b66bfe405d8b70c703684e60bedbad5c7d4213 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Sat, 14 Jan 2017 21:35:53 +0200
-Subject: [PATCH] tests/ts_calibrate: add missing headers
-
-The open(2) system call requires sys/types.h and sys/stat.h. Fix the following
-build failure under uClibc-ng:
-
-ts_calibrate.c: In function ‘main’:
-ts_calibrate.c:248:19: error: ‘S_IRUSR’ undeclared (first use in this function)
-                   S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-                   ^
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: https://github.com/kergoth/tslib/pull/59
- tests/ts_calibrate.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c
-index c6652e479d4b..9a98d1f86205 100644
---- a/tests/ts_calibrate.c
-+++ b/tests/ts_calibrate.c
-@@ -17,6 +17,8 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #ifdef __ANDROID__
- #include <fcntl.h>
--- 
-2.11.0
-
diff --git a/package/tslib/Config.in b/package/tslib/Config.in
index 6b86ebc..bc5d790 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 an abstraction layer for touchscreen panel events.
+	  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 cdbe0d2..6540ac8 100644
--- a/package/tslib/tslib.hash
+++ b/package/tslib/tslib.hash
@@ -1,2 +1,2 @@ 
-# Locally generated
-sha256  e935101adca980a14d1a13362796222575f99e6a41db585e8358fffddb98d92c  tslib-1.3.tar.xz
+# taken from https://github.com/kergoth/tslib/releases/tag/1.4
+sha256  ad0373f1dbfda27caec92cb10421227f226c79d160488f1ac915585ba947741f  tslib-1.4.tar.xz
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
index d3388a2..5ea526e 100644
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-TSLIB_VERSION = 1.3
+TSLIB_VERSION = 1.4
 TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION)
 TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz
 TSLIB_LICENSE = GPL, LGPL