Bladeren bron

tslib: needs kernel headers 3.12

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>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Baruch Siach 8 jaren geleden
bovenliggende
commit
7c60211ce3

+ 3 - 2
package/directfb/Config.in

@@ -113,11 +113,12 @@ config BR2_PACKAGE_DIRECTFB_SERIALMOUSE
 config BR2_PACKAGE_DIRECTFB_TSLIB
 config BR2_PACKAGE_DIRECTFB_TSLIB
 	bool "enable touchscreen support"
 	bool "enable touchscreen support"
 	depends on !BR2_STATIC_LIBS # tslib
 	depends on !BR2_STATIC_LIBS # tslib
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # tslib
 	default y
 	default y
 	select BR2_PACKAGE_TSLIB
 	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
 config BR2_PACKAGE_DIRECTFB_GIF
 	bool "enable GIF support"
 	bool "enable GIF support"

+ 3 - 2
package/qt/Config.mouse.in

@@ -13,9 +13,10 @@ config BR2_PACKAGE_QT_MOUSE_TSLIB
 	bool "tslib"
 	bool "tslib"
 	select BR2_PACKAGE_TSLIB
 	select BR2_PACKAGE_TSLIB
 	depends on !BR2_STATIC_LIBS # 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
 config BR2_PACKAGE_QT_MOUSE_QVFB
 	bool "qvfb"
 	bool "qvfb"

+ 3 - 2
package/qt5/qt5base/Config.in

@@ -267,11 +267,12 @@ config BR2_PACKAGE_QT5BASE_ICU
 config BR2_PACKAGE_QT5BASE_TSLIB
 config BR2_PACKAGE_QT5BASE_TSLIB
 	bool "Enable Tslib support"
 	bool "Enable Tslib support"
 	depends on !BR2_STATIC_LIBS # dlopen
 	depends on !BR2_STATIC_LIBS # dlopen
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # tslib
 	select BR2_PACKAGE_TSLIB
 	select BR2_PACKAGE_TSLIB
 	help
 	help
 	  This options enables the Tslib plugin
 	  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
 endif

+ 3 - 2
package/tslib/Config.in

@@ -1,10 +1,11 @@
 config BR2_PACKAGE_TSLIB
 config BR2_PACKAGE_TSLIB
 	bool "tslib"
 	bool "tslib"
 	depends on !BR2_STATIC_LIBS # dlopen
 	depends on !BR2_STATIC_LIBS # dlopen
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
 	help
 	help
 	  Tslib is an abstraction layer for touchscreen panel events.
 	  Tslib is an abstraction layer for touchscreen panel events.
 
 
 	  https://github.com/kergoth/tslib
 	  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

+ 3 - 2
package/x11r7/xdriver_xf86-input-tslib/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 	bool "xf86-input-tslib"
 	bool "xf86-input-tslib"
 	depends on !BR2_STATIC_LIBS # 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_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	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
 	  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