summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-12-20 16:43:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:08 +0000
commit3bc3af2f51226170843bb7c825948734886d6682 (patch)
tree5e6419206765bb7c969f1320a64879413d52b9af
parentfca959f4667c09c93b4e18bd145d5a14520719d2 (diff)
downloadpoky-3bc3af2f51226170843bb7c825948734886d6682.tar.gz
libjpeg-turbo: upgrade 2.0.0 -> 2.0.1
* For changes, see: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/ChangeLog.md * Removed upstreamed patch (From OE-Core rev: 737a194042bb83045958b05c77f9ff5934db7982) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch18
-rw-r--r--meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch119
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb)6
3 files changed, 12 insertions, 131 deletions
diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
index 44c2c768b2..6f3d201b21 100644
--- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
+++ b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
@@ -1,4 +1,4 @@
1From 0a24f03a67425a7b58b3fd40d965c0c9801ae7a1 Mon Sep 17 00:00:00 2001 1From ce3bd4f0e46f738a9aec098e7c341ad6deeab9f2 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 27 Aug 2018 16:10:55 +0800 3Date: Mon, 27 Aug 2018 16:10:55 +0800
4Subject: [PATCH] libjpeg-turbo: fix package_qa error 4Subject: [PATCH] libjpeg-turbo: fix package_qa error
@@ -10,23 +10,23 @@ usr/bin/cjpeg contains probably-redundant RPATH /usr/lib
10Upstream-Status: Inappropriate[oe-specific] 10Upstream-Status: Inappropriate[oe-specific]
11 11
12Signed-off-by: Changqing Li <changqing.li@windriver.com> 12Signed-off-by: Changqing Li <changqing.li@windriver.com>
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13--- 14---
14 CMakeLists.txt | 2 -- 15 CMakeLists.txt | 4 ----
15 1 file changed, 2 deletions(-) 16 1 file changed, 4 deletions(-)
16 17
17diff --git a/CMakeLists.txt b/CMakeLists.txt 18diff --git a/CMakeLists.txt b/CMakeLists.txt
18index 1719522..682cef1 100644 19index efeb51a..bbebe55 100644
19--- a/CMakeLists.txt 20--- a/CMakeLists.txt
20+++ b/CMakeLists.txt 21+++ b/CMakeLists.txt
21@@ -109,8 +109,6 @@ endif() 22@@ -109,10 +109,6 @@ endif()
22 23
23 include(cmakescripts/GNUInstallDirs.cmake) 24 include(cmakescripts/GNUInstallDirs.cmake)
24 25
25-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) 26-if(ENABLE_SHARED)
27- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
28-endif()
26- 29-
27 macro(report_directory var) 30 macro(report_directory var)
28 if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var}) 31 if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
29 message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}") 32 message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}")
30--
312.7.4
32
diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch
deleted file mode 100644
index 16767ebb6b..0000000000
--- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch
+++ /dev/null
@@ -1,119 +0,0 @@
1From d301019d0f23d12b9666d3d88b0859067a4ade77 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 30 Aug 2018 15:08:23 +0800
4Subject: [PATCH] libjpeg-turbo: fix wrongly defined define HAVE_STDLIB_H
5
6when change build system from autotools to cmake, below
7part is replace wrongly:
8
9"#undef HAVE_STDLIB_H"
10should be change to "#cmakedefine HAVE_STDLIB_H 1"
11not "#cmakedefine HAVE_STDLIB_H"
12
13otherwise, even if stdlib.h is found, output file
14of configure_file() will define like: #define HAVE_STDLIB_H
15but we need it as #define HAVE_STDLIB_H 1, since for
16different defination of HAVE_STDLIB_H will cause below error:
17error: "HAVE_STDLIB_H" redefined [-Werror]
18
19Upstream-Status: Submitted[https://github.com/libjpeg-turbo/libjpeg-turbo/pull/275]
20
21Signed-off-by: Changqing Li <changqing.li@windriver.com>
22---
23 jconfig.h.in | 28 ++++++++++++++--------------
24 jconfigint.h.in | 4 ++--
25 2 files changed, 16 insertions(+), 16 deletions(-)
26
27diff --git a/jconfig.h.in b/jconfig.h.in
28index 2842754..18a69a4 100644
29--- a/jconfig.h.in
30+++ b/jconfig.h.in
31@@ -10,16 +10,16 @@
32 #define LIBJPEG_TURBO_VERSION_NUMBER @LIBJPEG_TURBO_VERSION_NUMBER@
33
34 /* Support arithmetic encoding */
35-#cmakedefine C_ARITH_CODING_SUPPORTED
36+#cmakedefine C_ARITH_CODING_SUPPORTED 1
37
38 /* Support arithmetic decoding */
39-#cmakedefine D_ARITH_CODING_SUPPORTED
40+#cmakedefine D_ARITH_CODING_SUPPORTED 1
41
42 /* Support in-memory source/destination managers */
43-#cmakedefine MEM_SRCDST_SUPPORTED
44+#cmakedefine MEM_SRCDST_SUPPORTED 1
45
46 /* Use accelerated SIMD routines. */
47-#cmakedefine WITH_SIMD
48+#cmakedefine WITH_SIMD 1
49
50 /*
51 * Define BITS_IN_JSAMPLE as either
52@@ -33,37 +33,37 @@
53 #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */
54
55 /* Define to 1 if you have the <locale.h> header file. */
56-#cmakedefine HAVE_LOCALE_H
57+#cmakedefine HAVE_LOCALE_H 1
58
59 /* Define to 1 if you have the <stddef.h> header file. */
60-#cmakedefine HAVE_STDDEF_H
61+#cmakedefine HAVE_STDDEF_H 1
62
63 /* Define to 1 if you have the <stdlib.h> header file. */
64-#cmakedefine HAVE_STDLIB_H
65+#cmakedefine HAVE_STDLIB_H 1
66
67 /* Define if you need to include <sys/types.h> to get size_t. */
68-#cmakedefine NEED_SYS_TYPES_H
69+#cmakedefine NEED_SYS_TYPES_H 1
70
71 /* Define if you have BSD-like bzero and bcopy in <strings.h> rather than
72 memset/memcpy in <string.h>. */
73-#cmakedefine NEED_BSD_STRINGS
74+#cmakedefine NEED_BSD_STRINGS 1
75
76 /* Define to 1 if the system has the type `unsigned char'. */
77-#cmakedefine HAVE_UNSIGNED_CHAR
78+#cmakedefine HAVE_UNSIGNED_CHAR 1
79
80 /* Define to 1 if the system has the type `unsigned short'. */
81-#cmakedefine HAVE_UNSIGNED_SHORT
82+#cmakedefine HAVE_UNSIGNED_SHORT 1
83
84 /* Compiler does not support pointers to undefined structures. */
85-#cmakedefine INCOMPLETE_TYPES_BROKEN
86+#cmakedefine INCOMPLETE_TYPES_BROKEN 1
87
88 /* Define if your (broken) compiler shifts signed values as if they were
89 unsigned. */
90-#cmakedefine RIGHT_SHIFT_IS_UNSIGNED
91+#cmakedefine RIGHT_SHIFT_IS_UNSIGNED 1
92
93 /* Define to 1 if type `char' is unsigned and you are not using gcc. */
94 #ifndef __CHAR_UNSIGNED__
95- #cmakedefine __CHAR_UNSIGNED__
96+ #cmakedefine __CHAR_UNSIGNED__ 1
97 #endif
98
99 /* Define to empty if `const' does not conform to ANSI C. */
100diff --git a/jconfigint.h.in b/jconfigint.h.in
101index 55df053..6c898ac 100644
102--- a/jconfigint.h.in
103+++ b/jconfigint.h.in
104@@ -17,10 +17,10 @@
105 #define SIZEOF_SIZE_T @SIZE_T@
106
107 /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
108-#cmakedefine HAVE_BUILTIN_CTZL
109+#cmakedefine HAVE_BUILTIN_CTZL 1
110
111 /* Define to 1 if you have the <intrin.h> header file. */
112-#cmakedefine HAVE_INTRIN_H
113+#cmakedefine HAVE_INTRIN_H 1
114
115 #if defined(_MSC_VER) && defined(HAVE_INTRIN_H)
116 #if (SIZEOF_SIZE_T == 8)
117--
1182.7.4
119
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb
index 282bf95e8a..72706be674 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb
@@ -12,10 +12,10 @@ DEPENDS_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://0001-libjpeg-turbo-fix-package_qa-error.patch \ 14 file://0001-libjpeg-turbo-fix-package_qa-error.patch \
15 file://0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch" 15 "
16 16
17SRC_URI[md5sum] = "b12a3fcf1d078db38410f27718a91b83" 17SRC_URI[md5sum] = "1b05a66aa9b006fd04ed29f408e68f46"
18SRC_URI[sha256sum] = "778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868" 18SRC_URI[sha256sum] = "e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff"
19UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" 19UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
20UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" 20UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
21 21