Parcourir la source

zbar: needs kernel headers >= 3.17

v4l2_query_ext_ctrl has been added in kernel 3.17:
https://github.com/torvalds/linux/commit/5082c2417841e64df975789011e182ce99a9dacd

Fixes:
 - http://autobuild.buildroot.org/results/d7b244cf9488eafb59ba8575f17884f4f8512db1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine il y a 6 ans
Parent
commit
dd08ca7aa9
2 fichiers modifiés avec 6 ajouts et 6 suppressions
  1. 3 3
      package/gstreamer/gst-plugins-bad/Config.in
  2. 3 3
      package/zbar/Config.in

+ 3 - 3
package/gstreamer/gst-plugins-bad/Config.in

@@ -326,12 +326,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR
 	depends on BR2_USE_MMU # zbar-> libv4l
 	depends on !BR2_STATIC_LIBS # zbar-> libv4l
 	depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar-> libv4l
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # zbar
 	select BR2_PACKAGE_ZBAR
 
-comment "zbar plugin needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0"
+comment "zbar plugin needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.17"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
 
 endif

+ 3 - 3
package/zbar/Config.in

@@ -3,7 +3,7 @@ config BR2_PACKAGE_ZBAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l
 	depends on BR2_USE_MMU # libv4l
 	depends on BR2_INSTALL_LIBSTDCPP # libv4l
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # v4l2_query_ext_ctrl
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBV4L
 	help
@@ -11,7 +11,7 @@ config BR2_PACKAGE_ZBAR
 
 	  https://git.linuxtv.org/zbar.git/about/
 
-comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.0"
+comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.17"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17