commit: 8932d46026a180fc809252ae81cbbd4da70d7af9 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sun May 20 22:36:15 2018 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sun May 20 22:36:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8932d460
media-libs/opencolorio: Fix build w/ yaml-cpp-0.6 Closes: https://bugs.gentoo.org/651970 Reported-by: Bernd Feige <Bernd.Feige <AT> gmx.net> Thanks-to: Joakim Gebart Nohlgård <joakim.nohlgard <AT> eistec.se> Package-Manager: Portage-2.3.38, Repoman-2.3.9 .../files/opencolorio-1.1.0-yaml-cpp-0.6.patch | 54 ++++++++++++++++++++++ media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild | 1 + 2 files changed, 55 insertions(+) diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch new file mode 100644 index 00000000000..2094e1ed58b --- /dev/null +++ b/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch @@ -0,0 +1,54 @@ +commit 8ce96cc5d590a1c094fb316968f2db8464f3be82 +Author: Joakim Nohlgård <[email protected]> +Date: Fri Mar 30 13:47:28 2018 +0200 + + OCIOYaml: Remove forward declarations to use system yaml-cpp headers + +diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp +index 68fcef6..8047d7e 100644 +--- a/src/core/OCIOYaml.cpp ++++ b/src/core/OCIOYaml.cpp +@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include <OpenColorIO/OpenColorIO.h> + +-#ifndef WIN32 +- +-// fwd declare yaml-cpp visibility +-#pragma GCC visibility push(hidden) +-namespace YAML { +- class Exception; +- class BadDereference; +- class RepresentationException; +- class EmitterException; +- class ParserException; +- class InvalidScalar; +- class KeyNotFound; +- template <typename T> class TypedKeyNotFound; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>; +- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>; +-} +-#pragma GCC visibility pop +- +-#endif +- + #ifdef WIN32 + #pragma warning( push ) + #pragma warning( disable: 4146 ) diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild index 82a5b17acd9..7ed8940ab02 100644 --- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild +++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch" "${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch" "${FILESDIR}/${P}-remove-building-of-bundled-programs.patch" + "${FILESDIR}/${P}-yaml-cpp-0.6.patch" ) pkg_setup() {
