mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] v4l-utils: make libjpeg dependency optional
Date: Wed, 27 Mar 2013 19:13:09 +0100	[thread overview]
Message-ID: <20130327181309.GV1289@pengutronix.de> (raw)
In-Reply-To: <1364230501-30659-1-git-send-email-h.feurstein@gmail.com>

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

      reply	other threads:[~2013-03-27 18:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-25 16:55 Hubert Feurstein
2013-03-27 18:13 ` Michael Olbrich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130327181309.GV1289@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox