diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-07-13 10:07:51 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-07-16 21:24:43 +0200 |
| commit | cc91a26758c9d9fe6eae62dc46336e60416ff640 (patch) | |
| tree | 692a7eac76466ba94704e37ba8b62d47abb88475 /rules/libjpeg.make | |
| parent | 90475914c284711656f70732402770a2513a6723 (diff) | |
| download | ptxdist-cc91a26758c9d9fe6eae62dc46336e60416ff640.tar.gz ptxdist-cc91a26758c9d9fe6eae62dc46336e60416ff640.tar.xz | |
libjpeg: version bump 2.0.5 -> 2.1.0
- Only the copyright year change in LICENSE.md.
- A statement regarding expired gif patents was removed from README.ijg.
And some cosmetic changes.
- Just a different offset for the license in jsimdext.inc
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libjpeg.make')
| -rw-r--r-- | rules/libjpeg.make | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/rules/libjpeg.make b/rules/libjpeg.make index 6f68cafe8..d0d3b569e 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg # # Paths and names # -LIBJPEG_VERSION := 2.0.5 -LIBJPEG_MD5 := 3a7dc293918775fc933f81e2bce36464 +LIBJPEG_VERSION := 2.1.0 +LIBJPEG_MD5 := be306afc2d2ebd6931b634df0e8cbaf5 LIBJPEG_SUFFIX := tar.gz LIBJPEG := libjpeg-turbo-$(LIBJPEG_VERSION) LIBJPEG_TARBALL := $(LIBJPEG).$(LIBJPEG_SUFFIX) @@ -26,9 +26,9 @@ LIBJPEG_SOURCE := $(SRCDIR)/$(LIBJPEG_TARBALL) LIBJPEG_DIR := $(BUILDDIR)/$(LIBJPEG) LIBJPEG_LICENSE := IJG, BSD-3-Clause, Zlib LIBJPEG_LICENSE_FILES := \ - file://LICENSE.md;md5=26d6491346496a57f75f00a78199122e \ - file://README.ijg;startline=112;endline=174;md5=3a823783b9d7587c8a5ef2447e833e19 \ - file://simd/nasm/jsimdext.inc;startline=12;endline=27;md5=839b9ed7df5168976efc071bee29a76e + file://LICENSE.md;md5=970f17d51650fe54e4f839c6e6121f79 \ + file://README.ijg;startline=112;endline=174;md5=9fcb5339d9de46b31309aeef52d7deb1 \ + file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=839b9ed7df5168976efc071bee29a76e # ---------------------------------------------------------------------------- # Prepare @@ -48,17 +48,18 @@ LIBJPEG_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DENABLE_SHARED=ON \ -DENABLE_STATIC=OFF \ + -DFORCE_INLINE=ON \ -DREQUIRE_SIMD=OFF \ -DWITH_12BIT=OFF \ -DWITH_ARITH_DEC=ON \ -DWITH_ARITH_ENC=ON \ + -DWITH_FUZZ=OFF \ -DWITH_JAVA=OFF \ -DWITH_JPEG7=ON \ -DWITH_JPEG8=ON \ -DWITH_MEM_SRCDST=ON \ -DWITH_SIMD=$(call ptx/onoff,LIBJPEG_SIMD) \ - -DWITHOUT_TURBOJPEG=ON \ - -DFORCE_INLINE=ON + -DWITH_TURBOJPEG=OFF # ---------------------------------------------------------------------------- # Target-Install |