diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-13 16:34:27 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-13 19:51:51 +0100 |
commit | 4d199ee29940002a669f641a573221fe637f41bb (patch) | |
tree | 22714e90c5aa1a8b33a5e9e2e0e3b1c388aba60d /rules | |
parent | 87fe8ebc88d5effc93a5bb9eeabc2e1860a84c04 (diff) | |
download | ptxdist-4d199ee29940002a669f641a573221fe637f41bb.tar.gz ptxdist-4d199ee29940002a669f641a573221fe637f41bb.tar.xz |
libjpeg: switch to libjpeg-turbo
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r-- | rules/libjpeg.in | 6 | ||||
-rw-r--r-- | rules/libjpeg.make | 27 |
2 files changed, 24 insertions, 9 deletions
diff --git a/rules/libjpeg.in b/rules/libjpeg.in index e9f1b667f..194388c22 100644 --- a/rules/libjpeg.in +++ b/rules/libjpeg.in @@ -2,9 +2,11 @@ menuconfig LIBJPEG tristate - prompt "libjpeg " + prompt "libjpeg-turbo " help - libjpeg is a library for handling the JPEG (JFIF) image format. + libjpeg-turbo is a library for handling the JPEG (JFIF) image format + that uses SIMD instructions (MMX, SSE2, AVX2, NEON, AltiVec) to + accelerate baseline JPEG compression an decompression. if LIBJPEG diff --git a/rules/libjpeg.make b/rules/libjpeg.make index e08c0d2e3..01c872de0 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -2,6 +2,7 @@ # # Copyright (C) 2006 by Erwin Rol # 2007, 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de> +# Copyright (C) 2017 by Philipp Zabel <p.zabel@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -17,23 +18,35 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg # # Paths and names # -LIBJPEG_VERSION := 9a -LIBJPEG_MD5 := 3353992aecaee1805ef4109aadd433e7 +LIBJPEG_VERSION := 1.5.2 +LIBJPEG_MD5 := 6b4923e297a7eaa255f08511017a8818 LIBJPEG_SUFFIX := tar.gz -LIBJPEG := jpeg-$(LIBJPEG_VERSION) -LIBJPEG_TARBALL := jpegsrc.v$(LIBJPEG_VERSION).$(LIBJPEG_SUFFIX) -LIBJPEG_URL := http://ijg.org/files/$(LIBJPEG_TARBALL) +LIBJPEG := libjpeg-turbo-$(LIBJPEG_VERSION) +LIBJPEG_TARBALL := $(LIBJPEG).$(LIBJPEG_SUFFIX) +LIBJPEG_URL := $(call ptx/mirror, SF, libjpeg-turbo/$(LIBJPEG_VERSION)/$(LIBJPEG_TARBALL)) LIBJPEG_SOURCE := $(SRCDIR)/$(LIBJPEG_TARBALL) LIBJPEG_DIR := $(BUILDDIR)/$(LIBJPEG) -LIBJPEG_LICENSE := IJG +LIBJPEG_LICENSE := IJG, BSD-3-Clause, Zlib LIBJPEG_LICENSE_FILES := \ - file://README;md5=ea93a8a2fed10106b63bc21679edacb9 + file://LICENSE.md;md5=f5bae2e0391ad876f09ae61ee2bcce69 # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- LIBJPEG_CONF_TOOL := autoconf +LIBJPEG_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --with-jpeg7 \ + --with-jpeg8 \ + --with-mem-srcdst \ + --without-arith-enc \ + --without-arith-dec \ + --without-12bit \ + --without-turbojpeg \ + --without-java \ + --without-gas-preprocessor \ + --with-simd # ---------------------------------------------------------------------------- # Target-Install |