diff mbox

tslib: needs kernel headers 3.12

Message ID 4a250493e254e7a958267c5ce153f9ef05e6fc69.1484830247.git.baruch@tkos.co.il
State Accepted
Commit 7c60211ce38273580f1f8bf5886771406f9899ca
Headers show

Commit Message

Baruch Siach Jan. 19, 2017, 12:50 p.m. UTC
Kernel headers 3.12+ are required since tslib version 1.3.

https://github.com/kergoth/tslib/blob/master/README.markdown

Update tslib reverse dependencies.

Fixes:
http://autobuild.buildroot.net/results/28d/28df38e2a042f1b5940bf35c18334ebf8810a348/
http://autobuild.buildroot.net/results/c38/c383cfee3673aa9fba36a86f1e68de63413c2987/
http://autobuild.buildroot.net/results/6dd/6ddb2cd9f4f41ee03dc10a73422ad37070811732/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 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, 15 insertions(+), 10 deletions(-)

Comments

Peter Korsgaard Jan. 19, 2017, 2:03 p.m. UTC | #1
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Kernel headers 3.12+ are required since tslib version 1.3.
 > https://github.com/kergoth/tslib/blob/master/README.markdown

 > Update tslib reverse dependencies.

 > Fixes:
 > http://autobuild.buildroot.net/results/28d/28df38e2a042f1b5940bf35c18334ebf8810a348/
 > http://autobuild.buildroot.net/results/c38/c383cfee3673aa9fba36a86f1e68de63413c2987/
 > http://autobuild.buildroot.net/results/6dd/6ddb2cd9f4f41ee03dc10a73422ad37070811732/

 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed, thanks.
Thomas Petazzoni Jan. 20, 2017, 12:26 a.m. UTC | #2
Hello,

On Thu, 19 Jan 2017 14:50:47 +0200, Baruch Siach wrote:
> Kernel headers 3.12+ are required since tslib version 1.3.
> 
> https://github.com/kergoth/tslib/blob/master/README.markdown
> 
> Update tslib reverse dependencies.
> 
> Fixes:
> http://autobuild.buildroot.net/results/28d/28df38e2a042f1b5940bf35c18334ebf8810a348/
> http://autobuild.buildroot.net/results/c38/c383cfee3673aa9fba36a86f1e68de63413c2987/
> http://autobuild.buildroot.net/results/6dd/6ddb2cd9f4f41ee03dc10a73422ad37070811732/
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Isn't this a bit annoying for people using tslib on kernel olders than
3.12 ? Isn't there a simpler patch to tslib to avoid depending on
headers >= 3.12 ?

Thanks,

Thomas
Baruch Siach Jan. 20, 2017, 3:35 a.m. UTC | #3
Hi Thomas,

On Fri, Jan 20, 2017 at 11:26:30AM +1100, Thomas Petazzoni wrote:
> On Thu, 19 Jan 2017 14:50:47 +0200, Baruch Siach wrote:
> > Kernel headers 3.12+ are required since tslib version 1.3.
> > 
> > https://github.com/kergoth/tslib/blob/master/README.markdown
> > 
> > Update tslib reverse dependencies.
> > 
> > Fixes:
> > http://autobuild.buildroot.net/results/28d/28df38e2a042f1b5940bf35c18334ebf8810a348/
> > http://autobuild.buildroot.net/results/c38/c383cfee3673aa9fba36a86f1e68de63413c2987/
> > http://autobuild.buildroot.net/results/6dd/6ddb2cd9f4f41ee03dc10a73422ad37070811732/
> > 
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> 
> Isn't this a bit annoying for people using tslib on kernel olders than
> 3.12 ? Isn't there a simpler patch to tslib to avoid depending on
> headers >= 3.12 ?

The present build failure seems to be easy to fix by skipping the ts_uinput 
tool on pre 3.12 kernels. But since upstream explicitly states that 3.12 is 
the oldest supported kernel (see commit message link) we are on our own here.

baruch
Peter Korsgaard Jan. 20, 2017, 1:46 p.m. UTC | #4
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

Hi,

 >> Isn't this a bit annoying for people using tslib on kernel olders than
 >> 3.12 ? Isn't there a simpler patch to tslib to avoid depending on
 >> headers >= 3.12 ?

 > The present build failure seems to be easy to fix by skipping the ts_uinput 
 > tool on pre 3.12 kernels. But since upstream explicitly states that 3.12 is 
 > the oldest supported kernel (see commit message link) we are on our own here.

I had the same idea originally, but as it isn't completely nontrivial to
disable the new code and against the wishes of upstream I decided to
leave that work for people needing it on pre-3.12 kernels.

With that said, if upstream isn't interested in integrating such a patch
then it isn't really nice having to carry it in Buildroot either.
Martin Kepplinger Jan. 25, 2017, 9:24 a.m. UTC | #5
On 2017-01-20 14:46, Peter Korsgaard wrote:
>>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> 
> Hi,
> 
>  >> Isn't this a bit annoying for people using tslib on kernel olders than
>  >> 3.12 ? Isn't there a simpler patch to tslib to avoid depending on
>  >> headers >= 3.12 ?
> 
>  > The present build failure seems to be easy to fix by skipping the ts_uinput 
>  > tool on pre 3.12 kernels. But since upstream explicitly states that 3.12 is 
>  > the oldest supported kernel (see commit message link) we are on our own here.
> 
> I had the same idea originally, but as it isn't completely nontrivial to
> disable the new code and against the wishes of upstream I decided to
> leave that work for people needing it on pre-3.12 kernels.
> 
> With that said, if upstream isn't interested in integrating such a patch
> then it isn't really nice having to carry it in Buildroot either.
> 

I (as the upstream maintainer) would happily take a patch that brings
back support for old kernels. plugins/input-raw and tools/ts_uinput
should be affected as they use multitouch.

Simply properly disabling them during configure would be an acceptable
first step to have as a requirement for old kernels.

A github pull request or a patch here would be equally fine with me and
I'd be happy to have it in version 1.4.
diff mbox

Patch

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index b5521647772d..35c0309a6f36 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -113,11 +113,12 @@  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"
-	depends on BR2_STATIC_LIBS
+comment "touchscreen support needs a toolchain w/ dynamic library, headers >= 3.12"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
 
 config BR2_PACKAGE_DIRECTFB_GIF
 	bool "enable GIF support"
diff --git a/package/qt/Config.mouse.in b/package/qt/Config.mouse.in
index 11da956f62f6..f15f8d5f5681 100644
--- a/package/qt/Config.mouse.in
+++ b/package/qt/Config.mouse.in
@@ -13,9 +13,10 @@  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"
-	depends on BR2_STATIC_LIBS
+comment "tslib support needs a toolchain w/ dynamic library, headers >= 3.12"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
 
 config BR2_PACKAGE_QT_MOUSE_QVFB
 	bool "qvfb"
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 7244fbedc68f..ad95138380c7 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -267,11 +267,12 @@  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"
-	depends on BR2_STATIC_LIBS
+comment "tslib support needs a toolchain w/ dynamic library, headers >= 3.12"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
 
 endif
diff --git a/package/tslib/Config.in b/package/tslib/Config.in
index 050588e834d4..6b86ebc4c97f 100644
--- a/package/tslib/Config.in
+++ b/package/tslib/Config.in
@@ -1,10 +1,11 @@ 
 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.
 
 	  https://github.com/kergoth/tslib
 
-comment "tslib needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
+comment "tslib needs a toolchain w/ dynamic library, headers >= 3.12"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
diff --git a/package/x11r7/xdriver_xf86-input-tslib/Config.in b/package/x11r7/xdriver_xf86-input-tslib/Config.in
index 9c6e2961537c..79b739686ec3 100644
--- a/package/x11r7/xdriver_xf86-input-tslib/Config.in
+++ b/package/x11r7/xdriver_xf86-input-tslib/Config.in
@@ -1,6 +1,7 @@ 
 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
@@ -10,5 +11,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"
-	depends on BR2_STATIC_LIBS
+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