diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2016-10-23 14:29:56 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:20 +0000 |
| commit | 86fdcfd1169e892192f85a80d228b9bd2b84497a (patch) | |
| tree | 95f1888d706c54a12b096602eed5393898b27313 /meta | |
| parent | 1aa70f441e6cda540699b65a45c0ad71eff5e17c (diff) | |
| download | openembedded-core-contrib-86fdcfd1169e892192f85a80d228b9bd2b84497a.tar.gz | |
libjpeg-turbo: Upgrade 1.5.0 -> 1.5.1
Bug fixes and various improvements for AArch64 and PowerPC.
Apply a patch from upstream to fix compilation on MIPS [RB]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb) | 7 |
2 files changed, 49 insertions, 3 deletions
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch b/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch new file mode 100644 index 0000000000..4d41237f13 --- /dev/null +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch @@ -0,0 +1,45 @@ +Fix a regression that causes the MIPS code from building. + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 7bfb22af123ac10798a9a4c9ec7b23e5065db35e Mon Sep 17 00:00:00 2001 +From: DRC <information@libjpeg-turbo.org> +Date: Mon, 26 Sep 2016 17:59:14 -0500 +Subject: [PATCH] Fix broken MIPS build + +Regression introduced by 9055fb408dcb585ce9392d395e16630d51002152 + +Fixes #104 +--- + ChangeLog.md | 3 +++ + simd/jsimd_mips.c | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/ChangeLog.md b/ChangeLog.md +index e2b9df3..71ddcaa 100644 +--- a/ChangeLog.md ++++ b/ChangeLog.md +@@ -6,6 +6,9 @@ + 1. Fixed a regression introduced by 1.5.1[7] that prevented libjpeg-turbo from + building with Android NDK platforms prior to android-21 (5.0). + ++2. Fixed a regression introduced by 1.5.1[1] that prevented the MIPS DSPR2 SIMD ++code in libjpeg-turbo from building. ++ + + 1.5.1 + ===== +diff --git a/simd/jsimd_mips.c b/simd/jsimd_mips.c +index 63b8115..02e90cd 100644 +--- a/simd/jsimd_mips.c ++++ b/simd/jsimd_mips.c +@@ -63,6 +63,8 @@ parse_proc_cpuinfo(const char* search_string) + LOCAL(void) + init_simd (void) + { ++ char *env = NULL; ++ + if (simd_support != ~0U) + return; + diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb index c9e70d73d2..70d38f4a1a 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb @@ -9,9 +9,10 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=05bab7c7ad899d85bfba60da1a127 " DEPENDS = "nasm-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "3fc5d9b6a8bce96161659ae7a9939257" -SRC_URI[sha256sum] = "9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://fix-mips.patch" +SRC_URI[md5sum] = "55deb139b0cac3c8200b75d485fc13f3" +SRC_URI[sha256sum] = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" |