Skip to contentSkip to conversation

tslib: bump to 1.4

PATCH Superseded Martin Kepplinger 4 participants 9 messages Feb 3, 2017 – Feb 8, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tslib: bump to 1.4

---
Older kernel headers than 3.12 should be supported again, but I didn't run tests, so I kept it in Config.in; just so you know in case you want to try.

 ...01-tests-ts_calibrate-add-missing-headers.patch | 35 ----------------------
 package/tslib/tslib.hash                           |  4 +--
 package/tslib/tslib.mk                             |  2 +-
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch
package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch deleted +0 -35
deleted file mode 100644
index 97cd4be..0000000
@@ -1,35 +0,0 @@
-From 54b66bfe405d8b70c703684e60bedbad5c7d4213 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-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 <[email protected]>
----
-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
-
package/tslib/tslib.hash +2 -2
index cdbe0d2..6540ac8 100644
@@ -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
package/tslib/tslib.mk +1 -1
index d3388a2..5ea526e 100644
@@ -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
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 tslib: bump to 1.4

Hello,

On Fri, 3 Feb 2017 12:45:18 +0100, Martin Kepplinger wrote:

This patch lacks your Signed-off-by line, so we unfortunately cannot apply it. Would you mind adding your Signed-off-by line?

Quoted 2 lines

Older kernel headers than 3.12 should be supported again, but I didn't run tests, so I kept it in Config.in; just so you know in case you want to try.

You can check whether it builds on a kernel older than 3.12 by using the following toolchain configuration:

http://autobuild.buildroot.net/toolchains/configs/br-arm-full.config

This one uses the 3.10 kernel headers.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 tslib: bump to 1.4

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

---
 ...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
package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch deleted +0 -35
deleted file mode 100644
index 97cd4be..0000000
@@ -1,35 +0,0 @@
-From 54b66bfe405d8b70c703684e60bedbad5c7d4213 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-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 <[email protected]>
----
-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
-
package/tslib/Config.in +3 -4
index 6b86ebc..bc5d790 100644
@@ -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
package/tslib/tslib.hash +2 -2
index cdbe0d2..6540ac8 100644
@@ -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
package/tslib/tslib.mk +1 -1
index d3388a2..5ea526e 100644
@@ -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
Signature · 1 line
2.1.4
#3 lore raw

PATCH v2 1/1 tslib: bump to 1.4

Hi Martin,

Quoted 3 lines · Martin Kepplinger

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.

Quoted 3 lines

* a small change in the package description

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#4 lore raw

PATCH 1/2 tslib: bump to 1.4

additionally this
* removes the patch adding missing headers (fixed upstream)
* slightly changes the package desctiption

---
 ...01-tests-ts_calibrate-add-missing-headers.patch | 35 ----------------------
 package/tslib/Config.in                            |  2 +-
 package/tslib/tslib.hash                           |  4 +--
 package/tslib/tslib.mk                             |  2 +-
 4 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch
package/tslib/0001-tests-ts_calibrate-add-missing-headers.patch deleted +0 -35
deleted file mode 100644
index 97cd4be..0000000
@@ -1,35 +0,0 @@
-From 54b66bfe405d8b70c703684e60bedbad5c7d4213 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-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 <[email protected]>
----
-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
-
package/tslib/Config.in +1 -1
index 6b86ebc..3665301 100644
@@ -3,7 +3,7 @@ config BR2_PACKAGE_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
 
package/tslib/tslib.hash +2 -2
index cdbe0d2..6540ac8 100644
@@ -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
package/tslib/tslib.mk +1 -1
index d3388a2..5ea526e 100644
@@ -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
Signature · 1 line
2.1.4
#5 lore raw

PATCH 2/2 Revert "tslib: needs kernel headers 3.12"

This reverts commit 7c60211ce38273580f1f8bf5886771406f9899ca.

tslib-1.4 removes this dependency.

---
 package/directfb/Config.in                       | 5 ++---
 package/qt/Config.mouse.in                       | 5 ++---
 package/qt5/qt5base/Config.in                    | 5 ++---
 package/tslib/Config.in                          | 5 ++---
 package/x11r7/xdriver_xf86-input-tslib/Config.in | 5 ++---
 5 files changed, 10 insertions(+), 15 deletions(-)
package/directfb/Config.in +2 -3
index 35c0309..b552164 100644
@@ -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"
package/qt/Config.mouse.in +2 -3
index f15f8d5..11da956 100644
@@ -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"
package/qt5/qt5base/Config.in +2 -3
index e273caa..f22e034 100644
@@ -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
package/tslib/Config.in +2 -3
index 3665301..bc5d790 100644
@@ -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
package/x11r7/xdriver_xf86-input-tslib/Config.in +2 -3
index 79b7396..9c6e296 100644
@@ -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
Signature · 1 line
2.1.4
#6 lore raw

PATCH 2/2 Revert "tslib: needs kernel headers 3.12"

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Kepplinger <[email protected]> writes:

This reverts commit 7c60211ce38273580f1f8bf5886771406f9899ca. tslib-1.4 removes this dependency.

I did a quick test build with the following config (3.5.4 headers):

BR2_x86_64=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_TSLIB=y

input-raw.c: In function 'ts_input_read_mt':
input-raw.c:520:11: error: 'ABS_MT_TOOL_X' undeclared (first use in this function) input-raw.c:520:11: note: each undeclared identifier is reported only once for each function it appears in input-raw.c:525:11: error: 'ABS_MT_TOOL_Y' undeclared (first use in this function) Makefile:825: recipe for target 'input-raw.lo' failed
make[4]: *** [input-raw.lo] Error 1
make[4]: *** Waiting for unfinished jobs....

So it seems like this still isn't fixed.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 2/2 Revert "tslib: needs kernel headers 3.12"

Hi Peter,

Quoted 19 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Kepplinger <[email protected]> writes:

This reverts commit 7c60211ce38273580f1f8bf5886771406f9899ca. tslib-1.4 removes this dependency.

I did a quick test build with the following config (3.5.4 headers):

BR2_x86_64=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_TSLIB=y

input-raw.c: In function 'ts_input_read_mt':
input-raw.c:520:11: error: 'ABS_MT_TOOL_X' undeclared (first use in this function) input-raw.c:520:11: note: each undeclared identifier is reported only once for each function it appears in input-raw.c:525:11: error: 'ABS_MT_TOOL_Y' undeclared (first use in this function) Makefile:825: recipe for target 'input-raw.lo' failed
make[4]: *** [input-raw.lo] Error 1
make[4]: *** Waiting for unfinished jobs....

Quoted 1 line

So it seems like this still isn't fixed.

This seems to be fixed upstream[1].

[1] https://github.com/kergoth/tslib/commit/02795c4fa8b842c6fc017e86b5e036466bd4d3ef

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -