diff options
| -rw-r--r-- | meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch (renamed from meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch) | 10 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb (renamed from meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb) | 4 |
2 files changed, 7 insertions, 7 deletions
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 index 0ba13cf88f..2e25ecc7ef 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 @@ | |||
| 1 | From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001 | 1 | From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Fri, 28 Sep 2018 00:38:50 +0200 | 3 | Date: Fri, 28 Sep 2018 00:38:50 +0200 |
| 4 | Subject: [PATCH] Do not ask cmake to export binaries - they don't make it | 4 | 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> | |||
| 15 | 1 file changed, 1 deletion(-) | 15 | 1 file changed, 1 deletion(-) |
| 16 | 16 | ||
| 17 | diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt | 17 | diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt |
| 18 | index 4324c36d..2c11fe02 100644 | 18 | index 26156bcb..9eff04aa 100644 |
| 19 | --- a/src/bin/jp2/CMakeLists.txt | 19 | --- a/src/bin/jp2/CMakeLists.txt |
| 20 | +++ b/src/bin/jp2/CMakeLists.txt | 20 | +++ b/src/bin/jp2/CMakeLists.txt |
| 21 | @@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump) | 21 | @@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump) |
| 22 | endif() | 22 | endif() |
| 23 | # Install exe | 23 | # Install exe |
| 24 | install(TARGETS ${exe} | 24 | install(TARGETS ${exe} |
| 25 | - EXPORT OpenJPEGTargets | 25 | - EXPORT OpenJPEGTargets |
| 26 | DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications | 26 | DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
| 27 | ) | 27 | ) |
| 28 | if(OPJ_USE_DSYMUTIL) | 28 | if(OPJ_USE_DSYMUTIL) |
| 29 | -- | 29 | -- |
| 30 | 2.14.4 | 30 | 2.25.1 |
| 31 | 31 | ||
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb index f2d74078e8..45f1b5ef42 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb | |||
| @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" | |||
| 6 | DEPENDS = "libpng tiff lcms zlib" | 6 | DEPENDS = "libpng tiff lcms zlib" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ |
| 9 | file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ | 9 | file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ |
| 10 | " | 10 | " |
| 11 | SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811" | 11 | SRCREV = "39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae" |
| 12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
| 13 | 13 | ||
| 14 | inherit cmake | 14 | inherit cmake |
