diff options
author | Ross Burton <ross.burton@arm.com> | 2023-07-04 11:21:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-10 11:36:34 +0100 |
commit | d9559953275cd6940c7cad22c42f60e1d3c7945c (patch) | |
tree | 947741fb02ec54e24606e4fdd6479f423151b082 | |
parent | e3b7c565852a48610d6a0bf9a51cb8455286ea97 (diff) | |
download | poky-d9559953275cd6940c7cad22c42f60e1d3c7945c.tar.gz |
libjpeg-turbo: upgrade to 3.0.0
Remove 0001-libjpeg-turbo-fix-package_qa-error.patch, doesn't appear to
be needed anymore.
Use the full upstream license for LICENSE, and change LIC_FILES_CHKSUM
to point at just the license overview in LICENSE.md.
(From OE-Core rev: d0cc8bb5047fe843532bcba37ca48d94c9749daf)
Signed-off-by: Ross Burton <ross.burton@arm.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.patch | 32 | ||||
-rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb) | 14 |
2 files changed, 5 insertions, 41 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 deleted file mode 100644 index fab5109f83..0000000000 --- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 5cf847b5bef8dc3f9f89bd09dd5af4e6603f393c Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 27 Aug 2018 16:10:55 +0800 | ||
4 | Subject: [PATCH] libjpeg-turbo: fix package_qa error | ||
5 | |||
6 | Fix package qa errors like below: | ||
7 | libjpeg.so.62.3.0 contains probably-redundant RPATH /usr/lib [useless-rpaths] | ||
8 | usr/bin/cjpeg contains probably-redundant RPATH /usr/lib | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-specific] | ||
11 | |||
12 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | CMakeLists.txt | 4 ---- | ||
16 | 1 file changed, 4 deletions(-) | ||
17 | |||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index 2bc3458..ea3041e 100644 | ||
20 | --- a/CMakeLists.txt | ||
21 | +++ b/CMakeLists.txt | ||
22 | @@ -191,10 +191,6 @@ endif() | ||
23 | report_option(ENABLE_SHARED "Shared libraries") | ||
24 | report_option(ENABLE_STATIC "Static libraries") | ||
25 | |||
26 | -if(ENABLE_SHARED) | ||
27 | - set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
28 | -endif() | ||
29 | - | ||
30 | if(WITH_JPEG8 OR WITH_JPEG7) | ||
31 | set(WITH_ARITH_ENC 1) | ||
32 | set(WITH_ARITH_DEC 1) | ||
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb index e086830c02..146d80008c 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb | |||
@@ -2,19 +2,15 @@ SUMMARY = "Hardware accelerated JPEG compression/decompression library" | |||
2 | DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression" | 2 | DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression" |
3 | HOMEPAGE = "http://libjpeg-turbo.org/" | 3 | HOMEPAGE = "http://libjpeg-turbo.org/" |
4 | 4 | ||
5 | LICENSE = "BSD-3-Clause" | 5 | LICENSE = "IJG & BSD-3-Clause & Zlib" |
6 | LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8a61af33cc1c681cd5cc297150bbb5bd \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155" |
7 | file://jpeglib.h;endline=16;md5=52b5eaade8d5b6a452a7693dfe52c084 \ | 7 | |
8 | file://djpeg.c;endline=11;md5=510b386442ab6a27ee241fc5669bc5ea \ | ||
9 | " | ||
10 | DEPENDS:append:x86-64:class-target = " nasm-native" | 8 | DEPENDS:append:x86-64:class-target = " nasm-native" |
11 | DEPENDS:append:x86:class-target = " nasm-native" | 9 | DEPENDS:append:x86:class-target = " nasm-native" |
12 | 10 | ||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" |
14 | file://0001-libjpeg-turbo-fix-package_qa-error.patch \ | ||
15 | " | ||
16 | 12 | ||
17 | SRC_URI[sha256sum] = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf" | 13 | SRC_URI[sha256sum] = "c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa" |
18 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" | 14 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" |
19 | UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" | 15 | UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" |
20 | 16 | ||