summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch45
-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 @@
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.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
10DEPENDS_append_x86-64_class-target = " nasm-native" 10DEPENDS_append_x86-64_class-target = " nasm-native"
11DEPENDS_append_x86_class-target = " nasm-native" 11DEPENDS_append_x86_class-target = " nasm-native"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
14 file://fix-mips.patch" 14
15SRC_URI[md5sum] = "55deb139b0cac3c8200b75d485fc13f3" 15SRC_URI[md5sum] = "6b4923e297a7eaa255f08511017a8818"
16SRC_URI[sha256sum] = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c" 16SRC_URI[sha256sum] = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"
17UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" 17UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
18UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" 18UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
19 19