[ptxdist] [PATCH] v4l-utils: make libjpeg dependency optional

[ptxdist] [PATCH] v4l-utils: make libjpeg dependency optional

[Hubert Feurstein]

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
 rules/v4l-utils.in   | 8 +++++++-
 rules/v4l-utils.make | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index 893b1e0..288ff75 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -6,7 +6,7 @@ menuconfig V4L_UTILS
 	select LIBC_RT		if V4L_UTILS_LIBV4LCONVERT
 	select LIBC_M		if V4L_UTILS_LIBV4LCONVERT
 	select LIBC_PTHREAD	if V4L_UTILS_LIBV4L2
-	select LIBJPEG		if V4L_UTILS_LIBV4LCONVERT
+	select LIBJPEG		if V4L_UTILS_LIBV4LCONVERT_JPEG
 	help
 	  Linux V4L2 and DVB API utilities and v4l libraries (libv4l).
 
@@ -26,6 +26,12 @@ config V4L_UTILS_LIBV4LCONVERT
 	bool
 	prompt "install libv4lconvert"
 
+config V4L_UTILS_LIBV4LCONVERT_JPEG
+	bool
+	default y
+	depends on V4L_UTILS_LIBV4LCONVERT
+	prompt "use libjpeg"
+
 config V4L_UTILS_V4L2COMPLIANCE
 	bool
 	select V4L_UTILS_LIBV4L2
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index d047885..911a022 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -34,6 +34,10 @@ V4L_UTILS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-qv4l2
 
+ifndef PTXCONF_V4L_UTILS_LIBV4LCONVERT_JPEG
+V4L_UTILS_CONF_OPT	+= --without-jpeg
+endif
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
1.8.1.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] v4l-utils: make libjpeg dependency optional

[Michael Olbrich]

On Mon, Mar 25, 2013 at 05:55:01PM +0100, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
>  rules/v4l-utils.in   | 8 +++++++-
>  rules/v4l-utils.make | 4 ++++
>  2 files changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
> index 893b1e0..288ff75 100644
> --- a/rules/v4l-utils.in
> +++ b/rules/v4l-utils.in
> @@ -6,7 +6,7 @@ menuconfig V4L_UTILS
>  	select LIBC_RT		if V4L_UTILS_LIBV4LCONVERT
>  	select LIBC_M		if V4L_UTILS_LIBV4LCONVERT
>  	select LIBC_PTHREAD	if V4L_UTILS_LIBV4L2
> -	select LIBJPEG		if V4L_UTILS_LIBV4LCONVERT
> +	select LIBJPEG		if V4L_UTILS_LIBV4LCONVERT_JPEG
>  	help
>  	  Linux V4L2 and DVB API utilities and v4l libraries (libv4l).
>  
> @@ -26,6 +26,12 @@ config V4L_UTILS_LIBV4LCONVERT
>  	bool
>  	prompt "install libv4lconvert"
>  
> +config V4L_UTILS_LIBV4LCONVERT_JPEG
> +	bool
> +	default y
> +	depends on V4L_UTILS_LIBV4LCONVERT
> +	prompt "use libjpeg"
> +
>  config V4L_UTILS_V4L2COMPLIANCE
>  	bool
>  	select V4L_UTILS_LIBV4L2
> diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
> index d047885..911a022 100644
> --- a/rules/v4l-utils.make
> +++ b/rules/v4l-utils.make
> @@ -34,6 +34,10 @@ V4L_UTILS_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-qv4l2
>  
> +ifndef PTXCONF_V4L_UTILS_LIBV4LCONVERT_JPEG
> +V4L_UTILS_CONF_OPT	+= --without-jpeg
> +endif

	--$(call ptx/wwo, PTXCONF_V4L_UTILS_LIBV4LCONVERT_JPEG)-jpeg

Add this directly to the list instead.

Michael

> +
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> -- 
> 1.8.1.3
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de