From 0468aae77fe828a7a0018669a7f9834fcdc41269 Mon Sep 17 00:00:00 2001 From: Vijay Anusuri Date: Fri, 14 Feb 2025 18:25:57 +0530 Subject: openjpeg: upgrade 2.5.0 -> 2.5.3 Includes fix for CVE-2024-56826 and CVE-2024-56827 ChangeLog: https://github.com/uclouvain/openjpeg/blob/v2.5.3/NEWS.md * Refresh 0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch Signed-off-by: Vijay Anusuri Signed-off-by: Armin Kuster --- ...cmake-to-export-binaries-they-don-t-make-.patch | 31 ++++++++++++++++++++++ ...cmake-to-export-binaries-they-don-t-make-.patch | 31 ---------------------- .../recipes-graphics/openjpeg/openjpeg_2.5.0.bb | 21 --------------- .../recipes-graphics/openjpeg/openjpeg_2.5.3.bb | 21 +++++++++++++++ 4 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch new file mode 100644 index 0000000000..2e25ecc7ef --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch @@ -0,0 +1,31 @@ +From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 28 Sep 2018 00:38:50 +0200 +Subject: [PATCH] Do not ask cmake to export binaries - they don't make it + dependants sysroots +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Andreas Müller +--- + src/bin/jp2/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt +index 26156bcb..9eff04aa 100644 +--- a/src/bin/jp2/CMakeLists.txt ++++ b/src/bin/jp2/CMakeLists.txt +@@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump) + endif() + # Install exe + install(TARGETS ${exe} +- EXPORT OpenJPEGTargets + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications + ) + if(OPJ_USE_DSYMUTIL) +-- +2.25.1 + diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch deleted file mode 100644 index 0ba13cf88f..0000000000 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 28 Sep 2018 00:38:50 +0200 -Subject: [PATCH] Do not ask cmake to export binaries - they don't make it - dependants sysroots -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Andreas Müller ---- - src/bin/jp2/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt -index 4324c36d..2c11fe02 100644 ---- a/src/bin/jp2/CMakeLists.txt -+++ b/src/bin/jp2/CMakeLists.txt -@@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump) - endif() - # Install exe - install(TARGETS ${exe} -- EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications - ) - if(OPJ_USE_DSYMUTIL) --- -2.14.4 - diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb deleted file mode 100644 index f2d74078e8..0000000000 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" -HOMEPAGE = "http://www.openjpeg.org" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" - -DEPENDS = "libpng tiff lcms zlib" - -SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ - file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ - " -SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811" -S = "${WORKDIR}/git" - -inherit cmake - -# for multilib -EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" - -FILES:${PN} += "${libdir}/openjpeg*" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb new file mode 100644 index 0000000000..231bf84573 --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" +HOMEPAGE = "http://www.openjpeg.org" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" + +DEPENDS = "libpng tiff lcms zlib" + +SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ + file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ + " +SRCREV = "210a8a5690d0da66f02d49420d7176a21ef409dc" +S = "${WORKDIR}/git" + +inherit cmake + +# for multilib +EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" + +FILES:${PN} += "${libdir}/openjpeg*" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf