* [meta-oe][PATCH v3] openjpeg: upgrade 2.3.0 -> 2.3.1
@ 2019-09-13 20:28 Trevor Gamblin
2019-09-13 20:30 ` Trevor Gamblin
0 siblings, 1 reply; 3+ messages in thread
From: Trevor Gamblin @ 2019-09-13 20:28 UTC (permalink / raw)
To: openembedded-devel
From: Trevor Gamblin <trevor.gamblin@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@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@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@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
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH v3] openjpeg: upgrade 2.3.0 -> 2.3.1
2019-09-13 20:28 [meta-oe][PATCH v3] openjpeg: upgrade 2.3.0 -> 2.3.1 Trevor Gamblin
@ 2019-09-13 20:30 ` Trevor Gamblin
2019-09-14 2:10 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Trevor Gamblin @ 2019-09-13 20:30 UTC (permalink / raw)
To: openembedded-devel
On 9/13/19 4:28 PM, Trevor Gamblin wrote:
> From: Trevor Gamblin <trevor.gamblin@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@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@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@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).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH v3] openjpeg: upgrade 2.3.0 -> 2.3.1
2019-09-13 20:30 ` Trevor Gamblin
@ 2019-09-14 2:10 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2019-09-14 2:10 UTC (permalink / raw)
To: Trevor Gamblin; +Cc: openembeded-devel
ends up with packaging errors on qemumips
01:26:05 ERROR: openjpeg-2.3.1-r0 do_package: QA Issue: openjpeg:
Files/directories were installed but not shipped in any package:
01:26:05 /usr/lib/openjpeg-2.3
01:26:05 /usr/lib/openjpeg-2.3/OpenJPEGConfig.cmake
01:26:05 /usr/lib/openjpeg-2.3/OpenJPEGTargets.cmake
01:26:05 /usr/lib/openjpeg-2.3/OpenJPEGTargets-noconfig.cmake
01:26:05 Please set FILES such that these items are packaged.
Alternatively if they are unneeded, avoid installing them or delete
them within do_install.
01:26:05 openjpeg: 4 installed and not shipped files. [installed-vs-shipped]
On Fri, Sep 13, 2019 at 1:30 PM Trevor Gamblin
<trevor.gamblin@windriver.com> wrote:
>
> On 9/13/19 4:28 PM, Trevor Gamblin wrote:
>
> > From: Trevor Gamblin <trevor.gamblin@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@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@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@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).
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-14 2:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-13 20:28 [meta-oe][PATCH v3] openjpeg: upgrade 2.3.0 -> 2.3.1 Trevor Gamblin
2019-09-13 20:30 ` Trevor Gamblin
2019-09-14 2:10 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.