| 1 |
commit: 4751ed3cfef4736ce6684af0b677f744e3fffe0f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 10 13:35:26 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 10 13:35:39 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4751ed3c |
| 7 |
|
| 8 |
media-libs/opencolorio: drop useless Boost check |
| 9 |
|
| 10 |
We don't actually need Boost; upstream were checking |
| 11 |
on behalf of yaml-cpp, which doesn't need Boost anymore |
| 12 |
anyway, but it wouldn't have been opencolorio's responsibility |
| 13 |
for it even if it did. |
| 14 |
|
| 15 |
This test has since been dropped upstream. |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/747553 |
| 18 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
|
| 21 |
.../opencolorio-1.1.1-yaml-cpp-boost-check.patch | 35 ++++++++++++++++++++++ |
| 22 |
media-libs/opencolorio/opencolorio-1.1.1.ebuild | 1 + |
| 23 |
2 files changed, 36 insertions(+) |
| 24 |
|
| 25 |
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch |
| 26 |
new file mode 100644 |
| 27 |
index 00000000000..0f3c3e3ba19 |
| 28 |
--- /dev/null |
| 29 |
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch |
| 30 |
@@ -0,0 +1,35 @@ |
| 31 |
+This check is redundant. The appropriate versions of yaml-cpp |
| 32 |
+already had a dependency on Boost, but that's not even the case anymore. |
| 33 |
+ |
| 34 |
+Check has been dropped upstream since. |
| 35 |
+https://bugs.gentoo.org/747553 |
| 36 |
+---- |
| 37 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 38 |
+index eb20913..434e38b 100644 |
| 39 |
+--- a/CMakeLists.txt |
| 40 |
++++ b/CMakeLists.txt |
| 41 |
+@@ -272,24 +272,6 @@ if(USE_EXTERNAL_YAML) |
| 42 |
+ mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) |
| 43 |
+ |
| 44 |
+ if(YAML_CPP_FOUND) |
| 45 |
+- if(YAML_CPP_VERSION VERSION_GREATER "0.5.0") |
| 46 |
+- # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them. |
| 47 |
+- # Don't bother doing this step if we are already including the boost headers for shared_ptr |
| 48 |
+- if(NOT OCIO_USE_BOOST_PTR) |
| 49 |
+- set(Boost_ADDITIONAL_VERSIONS "1.49" "1.45" "1.44" "1.43" "1.43.0" "1.42" |
| 50 |
+- "1.42.0" "1.41" "1.41.0" "1.40" |
| 51 |
+- "1.40.0" "1.39" "1.39.0" "1.38" |
| 52 |
+- "1.38.0" "1.37" "1.37.0" "1.34.1" |
| 53 |
+- "1_34_1") |
| 54 |
+- set(Boost_USE_MULTITHREADED ON) |
| 55 |
+- find_package(Boost 1.34) |
| 56 |
+- if(NOT Boost_FOUND) |
| 57 |
+- message(FATAL_ERROR "Error: Detected system yaml-cpp version ${YAML_CPP_VERSION} is greater than 0.5.0, and therefore requires boost, but a boost installation could not be found.") |
| 58 |
+- endif() |
| 59 |
+- |
| 60 |
+- set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}) |
| 61 |
+- endif() |
| 62 |
+- endif() |
| 63 |
+ set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${YAML_CPP_INCLUDE_DIRS}) |
| 64 |
+ else(YAML_CPP_FOUND) |
| 65 |
+ message(FATAL_ERROR "ERROR: System yaml-cpp library was not found. Make sure the library is installed and the pkg-config file exists.") |
| 66 |
|
| 67 |
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild |
| 68 |
index 9b3802a51da..9b6bcb993be 100644 |
| 69 |
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild |
| 70 |
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild |
| 71 |
@@ -51,6 +51,7 @@ PATCHES=( |
| 72 |
"${FILESDIR}/${PN}-1.1.0-remove-building-of-bundled-programs.patch" |
| 73 |
"${FILESDIR}/${PN}-1.1.0-yaml-cpp-0.6.patch" |
| 74 |
"${FILESDIR}/${PN}-1.1.0-remove-Werror.patch" |
| 75 |
+ "${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch" |
| 76 |
) |
| 77 |
|
| 78 |
pkg_setup() { |
Archives