Merge 9c76f9f274 into f788525078

libs/qrencode/Makefile

@@ -19,7 +19,7 @@ PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_qrencode
+PKG_CONFIG_DEPENDS:=CONFIG_QRENCODE_PNG
 
 PKG_BUILD_FLAGS:=lto
 
@@ -30,7 +30,9 @@ define Package/libqrencode
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Library for encoding data in a QR Code symbol
+  MENU:=1
   URL:=https://fukuchi.org/works/qrencode/
+  DEPENDS:=+QRENCODE_PNG:libpng
 endef
 
 define Package/libqrencode/description
@@ -40,6 +42,14 @@ as a mobile phone with CCD. The capacity of QR Code is up to 7000
 digits or 4000 characters, and is highly robust.
 endef
 
+define Package/libqrencode/config
+  config QRENCODE_PNG
+	bool "Enable PNG output"
+	depends on PACKAGE_libqrencode
+	select PACKAGE_libpng
+	default n
+endef
+
 define Package/qrencode
   SECTION:=utils
   CATEGORY:=Utilities
@@ -56,8 +66,8 @@ digits or 4000 characters, and is highly robust.
 endef
 
 CMAKE_OPTIONS += \
-	-DCMAKE_DISABLE_FIND_PACKAGE_PNG=ON \
-	-DWITHOUT_PNG=ON \
+	-DCMAKE_DISABLE_FIND_PACKAGE_PNG=O$(if $(CONFIG_QRENCODE_PNG),FF,N) \
+	-DWITHOUT_PNG=O$(if $(CONFIG_QRENCODE_PNG),FF,N) \
 	-DWITH_TOOLS=O$(if $(CONFIG_PACKAGE_qrencode),N,FF) \
 	-DWITH_TESTS=OFF \
 	-DBUILD_SHARED_LIBS=ON