summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-02-20 15:12:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-20 11:30:36 +0000
commit42bf1baea43633ee85898e64ab8c2939c4082314 (patch)
tree050ac32d9d610062ee6ceb929b68bcecc967a2f7
parentec7ffc38d15a6b28999940938424b2df2d3ca9e3 (diff)
downloadpoky-42bf1baea43633ee85898e64ab8c2939c4082314.tar.gz
libjpeg-turbo: upgrade 2.0.1 -> 2.0.2
For changes, see: https://github.com/libjpeg-turbo/libjpeg-turbo/releases (From OE-Core rev: 5b89f003c3fc399b08b636f841e0f9f4c3043427) 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.patch16
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb)4
2 files changed, 10 insertions, 10 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 6f3d201b21..82fffe1e68 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 ce3bd4f0e46f738a9aec098e7c341ad6deeab9f2 Mon Sep 17 00:00:00 2001 1From 5cf847b5bef8dc3f9f89bd09dd5af4e6603f393c 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
@@ -16,17 +16,17 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
16 1 file changed, 4 deletions(-) 16 1 file changed, 4 deletions(-)
17 17
18diff --git a/CMakeLists.txt b/CMakeLists.txt 18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index efeb51a..bbebe55 100644 19index 2bc3458..ea3041e 100644
20--- a/CMakeLists.txt 20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt 21+++ b/CMakeLists.txt
22@@ -109,10 +109,6 @@ endif() 22@@ -189,10 +189,6 @@ endif()
23 23 report_option(ENABLE_SHARED "Shared libraries")
24 include(cmakescripts/GNUInstallDirs.cmake) 24 report_option(ENABLE_STATIC "Static libraries")
25 25
26-if(ENABLE_SHARED) 26-if(ENABLE_SHARED)
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 macro(report_directory var) 30 if(WITH_12BIT)
31 if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var}) 31 set(WITH_ARITH_DEC 0)
32 message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}") 32 set(WITH_ARITH_ENC 0)
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
index 029847ff5f..e1df754b76 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb
@@ -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
17SRC_URI[md5sum] = "1b05a66aa9b006fd04ed29f408e68f46" 17SRC_URI[md5sum] = "79f76fbfb0c6109631332762d10e16d2"
18SRC_URI[sha256sum] = "e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff" 18SRC_URI[sha256sum] = "acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed"
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