From: Zhang Peng <[email protected]>

This upgrade includes fix for CVE-2024-56826 and CVE-2024-56827.

Changlog:
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: Zhang Peng <[email protected]>
---
 ...t-ask-cmake-to-export-binaries-they-don-t-make-.patch} | 8 ++++----
 .../openjpeg/{openjpeg_2.5.0.bb => openjpeg_2.5.3.bb}     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename 
meta-oe/recipes-graphics/openjpeg/openjpeg/{0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
 => 0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch} (82%)
 rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.5.0.bb => 
openjpeg_2.5.3.bb} (82%)

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/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
similarity index 82%
rename from 
meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
rename to 
meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
index 0ba13cf88..47e4aebb4 100644
--- 
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/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
@@ -1,4 +1,4 @@
-From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001
+From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Fri, 28 Sep 2018 00:38:50 +0200
 Subject: [PATCH] Do not ask cmake to export binaries - they don't make it
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller <[email protected]>
  1 file changed, 1 deletion(-)
 
 diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
-index 4324c36d..2c11fe02 100644
+index 26156bcb..9eff04aa 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)
@@ -23,9 +23,9 @@ index 4324c36d..2c11fe02 100644
    # Install exe
    install(TARGETS ${exe}
 -    EXPORT OpenJPEGTargets
-     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
    )
    if(OPJ_USE_DSYMUTIL)
 -- 
-2.14.4
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb 
b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
similarity index 82%
rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb
rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
index f2d74078e..231bf8457 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
@@ -6,9 +6,9 @@ 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 \
+           
file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
            "
-SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811"
+SRCREV = "210a8a5690d0da66f02d49420d7176a21ef409dc"
 S = "${WORKDIR}/git"
 
 inherit cmake
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#114845): 
https://lists.openembedded.org/g/openembedded-devel/message/114845
Mute This Topic: https://lists.openembedded.org/mt/110603420/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

  • [oe] [meta-oe][scarthga... Zhang, Peng (Paul) (CN) via lists.openembedded.org

Reply via email to