Преглед на файлове

package/gst-plugins-bad: allow static build of zbar plugin

zbar can be built statically since commit
fc4a6abfa6bbffeabefb9967dbf378c410fb6318 so remove the dynamic library
dependency from BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ec9b3aec53f55fd1aca99c42f737afafdf912a7f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine преди 6 години
родител
ревизия
46c5ef2f17
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 2 3
      package/gstreamer/gst-plugins-bad/Config.in

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

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