similarity index 75%
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
@@ -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?= <schnitzeltony@gmail.com>
Date: Fri, 28 Sep 2018 00:38:50 +0200
Subject: [PATCH] Do not ask cmake to export binaries - they don't make it
@@ -15,17 +15,17 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
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)
+@@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump)
endif()
# 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
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.2.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 = "39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae"
S = "${WORKDIR}/git"
inherit cmake
ChangeLog: https://github.com/uclouvain/openjpeg/blob/v2.5.2/NEWS.md * Refresh 0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ...sk-cmake-to-export-binaries-they-don-t-make-.patch} | 10 +++++----- .../openjpeg/{openjpeg_2.5.0.bb => openjpeg_2.5.2.bb} | 4 ++-- 2 files changed, 7 insertions(+), 7 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} (75%) rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.5.0.bb => openjpeg_2.5.2.bb} (82%)