diff options
author | Trevor Gamblin <trevor.gamblin@windriver.com> | 2019-09-16 13:36:11 -0400 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-16 18:24:48 -0700 |
commit | 692a502d4a7b92e9e7fc32eafc2eb8746f1f95b5 (patch) | |
tree | 919dd5f053f5fbb318d792c83d8c74577dd786f7 /meta-oe | |
parent | d88410ca42b833f4bf31bda70074a15ff47d68d3 (diff) | |
download | meta-openembedded-692a502d4a7b92e9e7fc32eafc2eb8746f1f95b5.tar.gz |
openjpeg: upgrade 2.3.0 -> 2.3.1
Upgrading fixes CVE-2018-21010 and incorporates other bug fixes
from upstream.
The source upgrade to 2.3.1 changed the way include directories are
identified, so the patch 0001-Ensure-cmake-files-are-installed-at-common-location.patch
is no longer needed to help poppler find cmake files.
The contents of /usr/lib/openjpeg-2.3 were added to the FILES
list since poppler needs them to build.
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch | 48 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb (renamed from meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb) | 5 |
2 files changed, 3 insertions, 50 deletions
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch deleted file mode 100644 index 5c5fe64f2..000000000 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Thu, 27 Sep 2018 23:45:04 +0200 | ||
4 | Subject: [PATCH] Ensure cmake files are installed at common location | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | * Otherwise recent poppler is not able to find them | ||
10 | * Include path needs adjustment with this change | ||
11 | |||
12 | Upstream-Status: Inappropriate [Configuration] | ||
13 | |||
14 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
15 | --- | ||
16 | CMakeLists.txt | 2 +- | ||
17 | cmake/OpenJPEGConfig.cmake.in | 2 +- | ||
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
21 | index ff70a06f..23d2fac4 100644 | ||
22 | --- a/CMakeLists.txt | ||
23 | +++ b/CMakeLists.txt | ||
24 | @@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) | ||
25 | # We could install *.cmake files in share/ however those files contains | ||
26 | # hardcoded path to libraries on a multi-arch system (fedora/debian) those | ||
27 | # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) | ||
28 | - set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") | ||
29 | + set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") | ||
30 | endif() | ||
31 | |||
32 | if (APPLE) | ||
33 | diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in | ||
34 | index b20294ca..6a2f4baf 100644 | ||
35 | --- a/cmake/OpenJPEGConfig.cmake.in | ||
36 | +++ b/cmake/OpenJPEGConfig.cmake.in | ||
37 | @@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) | ||
38 | if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) | ||
39 | # This is an install tree | ||
40 | include(${SELF_DIR}/OpenJPEGTargets.cmake) | ||
41 | - get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) | ||
42 | + get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) | ||
43 | set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) | ||
44 | |||
45 | else() | ||
46 | -- | ||
47 | 2.14.4 | ||
48 | |||
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb index d30ff4825..b19f9109d 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb | |||
@@ -7,13 +7,14 @@ DEPENDS = "libpng tiff lcms zlib" | |||
7 | 7 | ||
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | git://github.com/uclouvain/openjpeg.git \ | 9 | git://github.com/uclouvain/openjpeg.git \ |
10 | file://0001-Ensure-cmake-files-are-installed-at-common-location.patch \ | ||
11 | file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ | 10 | file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ |
12 | " | 11 | " |
13 | SRCREV = "081de4b15f54cb4482035b7bf5e3fb443e4bc84b" | 12 | SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788" |
14 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
15 | 14 | ||
16 | inherit cmake | 15 | inherit cmake |
17 | 16 | ||
18 | # for multilib | 17 | # for multilib |
19 | EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" | 18 | EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" |
19 | |||
20 | FILES_${PN} += "${libdir}/openjpeg*" | ||