On Fri, Feb 18, 2022 at 05:27:50PM +0100, Christian Melki wrote: > On 2/18/22 17:08, Philipp Zabel wrote: > > Enable building libturbojpeg for users of the simplified API. > > > > Signed-off-by: Philipp Zabel <[email protected]> > > --- > > 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..704f810a4bd4 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 > > + -DWITHOUT_TURBOJPEG=$(call ptx/ifdef, PTXCONF_LIBJPEG_TURBO,OFF,ON) > > Looks weird. Didn't -DWITH work?
Weird indeed. Philipp, what's going on here? Michael > > > > # > > ---------------------------------------------------------------------------- > > # 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 > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
