diff options
author | zangrc <zangrc.fnst@cn.fujitsu.com> | 2020-11-27 15:10:47 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-29 20:24:32 +0000 |
commit | fe1c75139d4afd890e10b1cb453389a296b5d0b1 (patch) | |
tree | 2ca1a194ec373a7ba6a95ee081f36aadadbe27f2 /meta/recipes-graphics/jpeg | |
parent | 238e4bc48bca7c05268341591e3674d58d779ff1 (diff) | |
download | poky-fe1c75139d4afd890e10b1cb453389a296b5d0b1.tar.gz |
libjpeg-turbo: upgrade 2.0.5 -> 2.0.6
-License-Update: Copyright year updated to 2020.
Refresh the following patch:
0001-libjpeg-turbo-fix-package_qa-error.patch
(From OE-Core rev: 490fe53f625417494dd63a4fe4dcaa98a3c54eb9)
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/jpeg')
-rw-r--r-- | meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.5.bb) | 8 |
2 files changed, 8 insertions, 8 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 82fffe1e68..152db441bc 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 | |||
@@ -19,7 +19,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt | |||
19 | index 2bc3458..ea3041e 100644 | 19 | index 2bc3458..ea3041e 100644 |
20 | --- a/CMakeLists.txt | 20 | --- a/CMakeLists.txt |
21 | +++ b/CMakeLists.txt | 21 | +++ b/CMakeLists.txt |
22 | @@ -189,10 +189,6 @@ endif() | 22 | @@ -191,10 +191,6 @@ endif() |
23 | report_option(ENABLE_SHARED "Shared libraries") | 23 | report_option(ENABLE_SHARED "Shared libraries") |
24 | report_option(ENABLE_STATIC "Static libraries") | 24 | report_option(ENABLE_STATIC "Static libraries") |
25 | 25 | ||
@@ -27,6 +27,6 @@ index 2bc3458..ea3041e 100644 | |||
27 | - set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) | 27 | - set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) |
28 | -endif() | 28 | -endif() |
29 | - | 29 | - |
30 | if(WITH_12BIT) | 30 | if(WITH_JPEG8 OR WITH_JPEG7) |
31 | set(WITH_ARITH_DEC 0) | 31 | set(WITH_ARITH_ENC 1) |
32 | set(WITH_ARITH_ENC 0) | 32 | set(WITH_ARITH_DEC 1) |
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.5.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb index 9729fb5dd5..b6efc6bca0 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.5.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb | |||
@@ -4,8 +4,8 @@ HOMEPAGE = "http://libjpeg-turbo.org/" | |||
4 | 4 | ||
5 | LICENSE = "BSD-3-Clause" | 5 | LICENSE = "BSD-3-Clause" |
6 | LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \ | 6 | LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \ |
7 | file://jpeglib.h;endline=16;md5=7ea97dc83b0f59052ee837e61ef0e08f \ | 7 | file://jpeglib.h;endline=16;md5=52b5eaade8d5b6a452a7693dfe52c084 \ |
8 | file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \ | 8 | file://djpeg.c;endline=11;md5=302e980133b5c0c7f4dcb4ca0df41090 \ |
9 | " | 9 | " |
10 | DEPENDS_append_x86-64_class-target = " nasm-native" | 10 | DEPENDS_append_x86-64_class-target = " nasm-native" |
11 | DEPENDS_append_x86_class-target = " nasm-native" | 11 | DEPENDS_append_x86_class-target = " nasm-native" |
@@ -14,8 +14,8 @@ SRC_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 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "3a7dc293918775fc933f81e2bce36464" | 17 | SRC_URI[md5sum] = "4cada3f0bdc93d826fa31bf9e4469ef6" |
18 | SRC_URI[sha256sum] = "16f8f6f2715b3a38ab562a84357c793dd56ae9899ce130563c72cd93d8357b5d" | 18 | SRC_URI[sha256sum] = "d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb" |
19 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" | 19 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" |
20 | UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" | 20 | UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" |
21 | 21 | ||