mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] libjpeg: enable building libturbojpeg
Date: Mon, 28 Feb 2022 13:09:21 +0100	[thread overview]
Message-ID: <20220228120921.2631877-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220223113155.697245-1-p.zabel@pengutronix.de>

Thanks, applied as 7fe9471133ea89fc08f1fff62a6cf5f91a776607.

Michael

[sent from post-receive hook]

On Mon, 28 Feb 2022 13:09:20 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Enable building libturbojpeg for users of the simplified API.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220223113155.697245-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libjpeg.in b/rules/libjpeg.in
> index 53a9d9e09701..3304c6ac896f 100644
> --- a/rules/libjpeg.in
> +++ b/rules/libjpeg.in
> @@ -19,4 +19,11 @@ config LIBJPEG_BIN
>  	  cjpeg and djpeg are simple bineries to convert some basic image
>  	  formats to jpeg (cjpeg) or convert them back from jpeg (djpeg)
>  
> +config LIBJPEG_TURBO
> +	bool
> +	prompt "Build and install libturbojpeg"
> +	help
> +	  In addition to the traditional libjpeg API, also provide the less
> +	  powerful but more straightforward TurboJPEG API.
> +
>  endif
> diff --git a/rules/libjpeg.make b/rules/libjpeg.make
> index 559a6d08d504..2807d9bc1d89 100644
> --- a/rules/libjpeg.make
> +++ b/rules/libjpeg.make
> @@ -60,7 +60,7 @@ LIBJPEG_CONF_OPT := \
>  	-DWITH_JPEG8=ON \
>  	-DWITH_MEM_SRCDST=ON \
>  	-DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \
> -	-DWITH_TURBOJPEG=OFF
> +	-DWITH_TURBOJPEG=$(call ptx/onoff,PTXCONF_LIBJPEG_TURBO)
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -76,6 +76,9 @@ $(STATEDIR)/libjpeg.targetinstall:
>  	@$(call install_fixup, libjpeg,DESCRIPTION,missing)
>  
>  	@$(call install_lib, libjpeg, 0, 0, 0644, libjpeg)
> +ifdef PTXCONF_LIBJPEG_TURBO
> +	@$(call install_lib, libjpeg, 0, 0, 0644, libturbojpeg)
> +endif
>  ifdef PTXCONF_LIBJPEG_BIN
>  	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/cjpeg)
>  	@$(call install_copy, libjpeg, 0, 0, 0755, -, /usr/bin/djpeg)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


      reply	other threads:[~2022-02-28 12:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-23 11:31 [ptxdist] [PATCH v2] " Philipp Zabel
2022-02-28 12:09 ` 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=20220228120921.2631877-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=p.zabel@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