[oe] [meta-oe][PATCH v3] openjpeg: upgrade 2.3.0 -> 2.3.1

[Trevor Gamblin]

On 9/13/19 4:28 PM, Trevor Gamblin wrote:

> From: Trevor Gamblin <trevor.gamblin at windriver.com>
>
> 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.
>
> Signed-off-by: Trevor Gamblin <trevor.gamblin at windriver.com>
> ---
>   ...ke-files-are-installed-at-common-location.patch | 48 ----------------------
>   .../{openjpeg_2.3.0.bb => openjpeg_2.3.1.bb}       |  3 +-
>   2 files changed, 1 insertion(+), 50 deletions(-)
>   delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
>   rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.3.0.bb => openjpeg_2.3.1.bb} (79%)
>
> 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 5c5fe64..0000000
> --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -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
> -
> -* 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
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -150,7 +150,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)
> --  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
> -+  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
> - endif()
> -
> - if (APPLE)
> -diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
> -index b20294ca..6a2f4baf 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)
> -+  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
> -   set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
> -
> - else()
> ---
> -2.14.4
> -
> 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 79%
> 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..7c92ebc 100644
> --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb
> @@ -7,10 +7,9 @@ DEPENDS = "libpng tiff lcms zlib"
>   
>   SRC_URI = " \
>       git://github.com/uclouvain/openjpeg.git \
> -    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
Misunderstood the purpose of the cmake includes patch in the last 
version. Should build now (poppler build works for me).