summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/jpeg
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-10-23 14:29:56 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:35 +0000
commit9a18102560d3a29a014479beba60aebb328e36df (patch)
treeaf583c792cacdb9783b9df5cdf7ab30db4c2be5b /meta/recipes-graphics/jpeg
parente7db31e5c47bf3e77e0353da59dbcd86b053bbce (diff)
downloadpoky-9a18102560d3a29a014479beba60aebb328e36df.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] (From OE-Core rev: 86fdcfd1169e892192f85a80d228b9bd2b84497a) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/jpeg')
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch45
-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 @@
1Fix a regression that causes the MIPS code from building.
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 7bfb22af123ac10798a9a4c9ec7b23e5065db35e Mon Sep 17 00:00:00 2001
7From: DRC <information@libjpeg-turbo.org>
8Date: Mon, 26 Sep 2016 17:59:14 -0500
9Subject: [PATCH] Fix broken MIPS build
10
11Regression introduced by 9055fb408dcb585ce9392d395e16630d51002152
12
13Fixes #104
14---
15 ChangeLog.md | 3 +++
16 simd/jsimd_mips.c | 2 ++
17 2 files changed, 5 insertions(+)
18
19diff --git a/ChangeLog.md b/ChangeLog.md
20index e2b9df3..71ddcaa 100644
21--- a/ChangeLog.md
22+++ b/ChangeLog.md
23@@ -6,6 +6,9 @@
24 1. Fixed a regression introduced by 1.5.1[7] that prevented libjpeg-turbo from
25 building with Android NDK platforms prior to android-21 (5.0).
26
27+2. Fixed a regression introduced by 1.5.1[1] that prevented the MIPS DSPR2 SIMD
28+code in libjpeg-turbo from building.
29+
30
31 1.5.1
32 =====
33diff --git a/simd/jsimd_mips.c b/simd/jsimd_mips.c
34index 63b8115..02e90cd 100644
35--- a/simd/jsimd_mips.c
36+++ b/simd/jsimd_mips.c
37@@ -63,6 +63,8 @@ parse_proc_cpuinfo(const char* search_string)
38 LOCAL(void)
39 init_simd (void)
40 {
41+ char *env = NULL;
42+
43 if (simd_support != ~0U)
44 return;
45
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
9" 9"
10DEPENDS = "nasm-native" 10DEPENDS = "nasm-native"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" 12SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
13SRC_URI[md5sum] = "3fc5d9b6a8bce96161659ae7a9939257" 13 file://fix-mips.patch"
14SRC_URI[sha256sum] = "9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f" 14SRC_URI[md5sum] = "55deb139b0cac3c8200b75d485fc13f3"
15SRC_URI[sha256sum] = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"
15UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" 16UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
16UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" 17UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
17 18