diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2017-07-19 18:01:20 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-21 22:45:20 +0100 |
| commit | 5b3c92af0cc7f12313d2e7ac02dc68f8e01b76a1 (patch) | |
| tree | 90054deed22ffd7da3d745bf777e8ea07239a331 /meta/recipes-graphics | |
| parent | 422cfb92af8d7d2982dc76614388f22aeb658062 (diff) | |
| download | openembedded-core-contrib-5b3c92af0cc7f12313d2e7ac02dc68f8e01b76a1.tar.gz | |
libjpeg-turbo: upgrade to 1.5.2
1.5.1 -> 1.5.2
Remove this backported patch:
1. fix-mips.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb) | 8 |
2 files changed, 4 insertions, 49 deletions
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch b/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch deleted file mode 100644 index 4d41237f13..0000000000 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -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.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb index de2eeaf78d..58646d35a8 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb @@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=05bab7c7ad899d85bfba60da1a127 DEPENDS_append_x86-64_class-target = " nasm-native" DEPENDS_append_x86_class-target = " nasm-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://fix-mips.patch" -SRC_URI[md5sum] = "55deb139b0cac3c8200b75d485fc13f3" -SRC_URI[sha256sum] = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" + +SRC_URI[md5sum] = "6b4923e297a7eaa255f08511017a8818" +SRC_URI[sha256sum] = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" |