Skip to contentSkip to conversation

package/tiff: Add utilities submenu and more utility options

PATCH New Bernd Kuhls 2 participants 2 messages Jan 18, 2015 – Jan 26, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/tiff: Add utilities submenu and more utility options

---
 package/tiff/Config.in |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 package/tiff/tiff.mk   |   36 +++++++++++++++++++++++++++---------
 2 files changed, 75 insertions(+), 9 deletions(-)
package/tiff/Config.in +48 -0
index 3a929f7..4b0e7db 100644
@@ -60,14 +60,62 @@ config BR2_PACKAGE_TIFF_JBIG
 	default y
 endmenu
 
+menu "tiff Utilities"
+
+config BR2_PACKAGE_TIFF_BMP2TIFF
+	bool "bmp2tiff"
+	help
+	  bmp2tiff utility
+
+config BR2_PACKAGE_TIFF_FAX2PS
+	bool "fax2ps"
+	help
+	  fax2ps utility
+
+config BR2_PACKAGE_TIFF_FAX2TIFF
+	bool "fax2tiff"
+	help
+	  fax2tiff utility
+
+config BR2_PACKAGE_TIFF_GIF2TIFF
+	bool "gif2tiff"
+	help
+	  gif2tiff utility
+
+config BR2_PACKAGE_TIFF_PAL2RGB
+	bool "pal2rgb"
+	help
+	  pal2rgb utility
+
+config BR2_PACKAGE_TIFF_PPM2TIFF
+	bool "ppm2tiff"
+	help
+	  ppm2tiff utility
+
+config BR2_PACKAGE_TIFF_RAS2TIFF
+	bool "ras2tiff"
+	help
+	  ras2tiff utility
+
+config BR2_PACKAGE_TIFF_RAW2TIFF
+	bool "raw2tiff"
+	help
+	  raw2tiff utility
+
 config BR2_PACKAGE_TIFF_TIFF2PDF
 	bool "tiff2pdf"
 	help
 	  tiff2pdf utility
 
+config BR2_PACKAGE_TIFF_TIFF2PS
+	bool "tiff2ps"
+	help
+	  tiff2ps utility
+
 config BR2_PACKAGE_TIFF_TIFFCP
 	bool "tiffcp"
 	help
 	  tiffcp utility
+endmenu
 
 endif
package/tiff/tiff.mk +27 -9
index 43f96b7..f801d04 100644
@@ -16,18 +16,9 @@ TIFF_CONF_OPTS = \
 TIFF_DEPENDENCIES = host-pkgconf
 
 TIFF_TOOLS_TO_DELETE = \
-	bmp2tiff \
-	fax2ps \
-	fax2tiff \
-	gif2tiff \
-	pal2rgb \
-	ppm2tiff \
-	ras2tiff \
-	raw2tiff \
 	rgb2ycbcr \
 	thumbnail \
 	tiff2bw \
-	tiff2ps \
 	tiff2rgba \
 	tiffcmp \
 	tiffcrop \
@@ -38,9 +29,36 @@ TIFF_TOOLS_TO_DELETE = \
 	tiffset \
 	tiffsplit \
 
+ifeq ($(BR2_PACKAGE_TIFF_BMP2TIFF),)
+	TIFF_TOOLS_TO_DELETE += bmp2tiff
+endif
+ifeq ($(BR2_PACKAGE_TIFF_FAX2PS),)
+	TIFF_TOOLS_TO_DELETE += fax2ps
+endif
+ifeq ($(BR2_PACKAGE_TIFF_FAX2TIFF),)
+	TIFF_TOOLS_TO_DELETE += fax2tiff
+endif
+ifeq ($(BR2_PACKAGE_TIFF_GIF2TIFF),)
+	TIFF_TOOLS_TO_DELETE += gif2tiff
+endif
+ifeq ($(BR2_PACKAGE_TIFF_PAL2RGB),)
+	TIFF_TOOLS_TO_DELETE += pal2rgb
+endif
+ifeq ($(BR2_PACKAGE_TIFF_PPM2TIFF),)
+	TIFF_TOOLS_TO_DELETE += ppm2tiff
+endif
+ifeq ($(BR2_PACKAGE_TIFF_RAS2TIFF),)
+	TIFF_TOOLS_TO_DELETE += ras2tiff
+endif
+ifeq ($(BR2_PACKAGE_TIFF_RAW2TIFF),)
+	TIFF_TOOLS_TO_DELETE += raw2tiff
+endif
 ifeq ($(BR2_PACKAGE_TIFF_TIFF2PDF),)
 	TIFF_TOOLS_TO_DELETE += tiff2pdf
 endif
+ifeq ($(BR2_PACKAGE_TIFF_TIFF2PS),)
+	TIFF_TOOLS_TO_DELETE += tiff2ps
+endif
 ifeq ($(BR2_PACKAGE_TIFF_TIFFCP),)
 	TIFF_TOOLS_TO_DELETE += tiffcp
 endif
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 package/tiff: Add utilities submenu and more utility options

Dear Bernd Kuhls,

Quoted 6 lines · Bernd Kuhls
---
 package/tiff/Config.in |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 package/tiff/tiff.mk   |   36 +++++++++++++++++++++++++++---------
 2 files changed, 75 insertions(+), 9 deletions(-)

My initial reaction is: woo, this is a lot of Config.in options for something such as the tiff library and utilities.

Can we reduce this to just: BR2_PACKAGE_LIBTIFF that installs the library, and BR2_PACKAGE_LIBTIFF_UTILS as a sub-option that also installs all the utilities?

If someone wants something more fine-grained than that, they can always remove the unnecessary tools in a post-build script.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com