From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 23 Feb 2022 12:32:48 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nMpt2-007ajx-UA for lore@lore.pengutronix.de; Wed, 23 Feb 2022 12:32:48 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nMpt2-0000Ky-7Q; Wed, 23 Feb 2022 12:32:48 +0100 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nMpsK-0000Kn-Br for ptxdist@pengutronix.de; Wed, 23 Feb 2022 12:32:04 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Wed, 23 Feb 2022 12:31:55 +0100 Message-Id: <20220223113155.697245-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2] libjpeg: enable building libturbojpeg X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Enable building libturbojpeg for users of the simplified API. Signed-off-by: Philipp Zabel --- 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