diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
| commit | 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (patch) | |
| tree | f4c7f54d0aeb344c21de9b9d1a3f1e9826d7a64c /media-libs/opencolorio | |
| parent | 2bacbb3374587799c77a999f56352233a353b19e (diff) | |
gentoo resync : 22.05.2018
Diffstat (limited to 'media-libs/opencolorio')
| -rw-r--r-- | media-libs/opencolorio/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch | 54 | ||||
| -rw-r--r-- | media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild | 1 |
3 files changed, 57 insertions, 1 deletions
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest index 4467c972af02..b195f28c83ee 100644 --- a/media-libs/opencolorio/Manifest +++ b/media-libs/opencolorio/Manifest @@ -3,9 +3,10 @@ AUX opencolorio-1.0.9-remove-external-doc-utilities.patch 2674 BLAKE2B b5fc77430 AUX opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch 2786 BLAKE2B 91747af3ceac6477d6847c1f87fa69cd77e2cdaaced18cc038ca231af006d453ce4382229b642e8c38ae1642c1f4788c7e9062951e867881bd20012c26a6dcd4 SHA512 2338e1b0994486a7be896d4edddcef67b3b84df9d609e7aebe7a87172163b5f6e7636341e0bfeb0e45d7fdb663932c273ca0568a49ac9d4aa2b827d3808493bc AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5 +AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998 EBUILD opencolorio-1.0.9-r2.ebuild 2375 BLAKE2B 6e50184ecd9df51cec933a55fbdb9365c82661b7e9d66d804bebdc329433c996d616898334bd3f1856b381371083584488faa46476962fe3c306db324d891575 SHA512 0e3d7dc603f5811e547ba6de400ae05c519e87ba6135bcda8d7fdbc1d5d87526c0fd8a2f8dd26062b39826bacdc6590fda538036d3cd7d09a0b86e70ccb202c1 -EBUILD opencolorio-1.1.0-r1.ebuild 2313 BLAKE2B 86e303621292f421ab94be33daa16b6390fa942166d3bb3cb9fe26627cb441723107f3cb0cd007aeb9eca0eaa8769e2e1a0b70ec9dd63eec1543562a3b2ec2d1 SHA512 a7cc0ae8a2de100a0dca4a4a54fdf7930958cdc0dec0e0e8850f1587a1c0a3db52c77572cc3e5be8efee0719a2f514c7642f6f87039db0eab603562cfb24b14a +EBUILD opencolorio-1.1.0-r1.ebuild 2352 BLAKE2B 48a06072eb619bba42e6c510ab37064109c4b16edb5d09ae4c5c934b1d01f25b8d6310ce0ea49179401eb71ed12c507560b7e26b009f1dc52a20a6e331d5298f SHA512 b87dc3c20d5e86f74d64f6369b7083cdab1c47bb1b29e84c785a26c94dc75b8b73ada08b0c9c9d702024aed5c2dfbfba8ee45163748ea453cace5d40ef4a41d7 MISC metadata.xml 686 BLAKE2B d2e3b9c9bc524854acf2fdd3d67d596606434bee2bbe5ceef3c2f45823e2948be0c0dc3bbcce82f90d2fb77e1fb5ae74b4e82ec737051f31c2726f82aecf05ee SHA512 68ba2a2e1063a0f8c3e345aa908f4327f38b876581f0cf3cce0e2075a06919c60ca77b40545fcbc923a61700d00e46bb0ff2ce5d44ac5cbe40b1523491e34822 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 000000000000..2094e1ed58b8 --- /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 <joakim.nohlgard@eistec.se> +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 82a5b17acd9e..7ed8940ab029 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() { |