[ptxdist] [PATCH v2] libjpeg: enable building libturbojpeg

[ptxdist] [PATCH v2] libjpeg: enable building libturbojpeg

[Philipp Zabel]

Enable building libturbojpeg for users of the simplified API.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Changes since v1:
 - Use -DWITH_TURBOJPEG and ptx/onoff instead off -DWITHOUT_TURBOJPEG
   and ptx/ifdef.
---
 rules/libjpeg.in   | 7 +++++++
 rules/libjpeg.make | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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)
-- 
2.30.2


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

Re: [ptxdist] [APPLIED] libjpeg: enable building libturbojpeg

[Michael Olbrich]

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