[oe-commits] [meta-openembedded] 24/24: openjpeg: upgrade 2.3.0 -> 2.3.1

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit deeef3e21a5caebe4ee633b23c788e36a353f076
Author: Trevor Gamblin <trevor.gamblin at windriver.com>
AuthorDate: Fri Sep 13 10:50:32 2019 -0400

    openjpeg: upgrade 2.3.0 -> 2.3.1
    
    Upgrading fixes CVE-2018-21010 and incorporates other bug fixes
    from upstream.
    
    Signed-off-by: Trevor Gamblin <trevor.gamblin at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...ke-files-are-installed-at-common-location.patch | 37 ++++++++--------------
 .../{openjpeg_2.3.0.bb => openjpeg_2.3.1.bb}       |  2 +-
 2 files changed, 15 insertions(+), 24 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
index 5c5fe64..dab2d7d 100644
--- 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
@@ -1,27 +1,18 @@
-From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
-Date: Thu, 27 Sep 2018 23:45:04 +0200
-Subject: [PATCH] Ensure cmake files are installed at common location
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From 1f15a8e565976036aaf9f29322f477d52f8a5cdd Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <trevor.gamblin at windriver.com>
+Date: Fri, 13 Sep 2019 10:11:08 -0400
+Subject: [PATCH] openjpeg: Ensure cmake files are installed at common location
 
-* Otherwise recent poppler is not able to find them
-* Include path needs adjustment with this change
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
 ---
  CMakeLists.txt                | 2 +-
  cmake/OpenJPEGConfig.cmake.in | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ff70a06f..23d2fac4 100644
+index 3ea2424a..fc1978da 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+@@ -151,7 +151,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
    # We could install *.cmake files in share/ however those files contains
    # hardcoded path to libraries on a multi-arch system (fedora/debian) those
    # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
@@ -31,18 +22,18 @@ index ff70a06f..23d2fac4 100644
  
  if (APPLE)
 diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index b20294ca..6a2f4baf 100644
+index 2925108a..f2541c8b 100644
 --- a/cmake/OpenJPEGConfig.cmake.in
 +++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
- if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-   # This is an install tree
-   include(${SELF_DIR}/OpenJPEGTargets.cmake)
--  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
+@@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
+   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+ 
+-  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
 +  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
-   set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
  
  else()
+   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
 -- 
-2.14.4
+2.17.1
 
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
similarity index 91%
rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
index d30ff48..3312df7 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
@@ -10,7 +10,7 @@ SRC_URI = " \
     file://0001-Ensure-cmake-files-are-installed-at-common-location.patch \
     file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
 "
-SRCREV = "081de4b15f54cb4482035b7bf5e3fb443e4bc84b"
+SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788"
 S = "${WORKDIR}/git"
 
 inherit cmake

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.