diff options
| author | joerg <joerg@pkgsrc.org> | 2013-10-14 14:37:30 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-10-14 14:37:30 +0000 |
| commit | d9acaf19a3ed2865c2efef4ab2d590b78d02de41 (patch) | |
| tree | 78a8a4e3f19bac0bcf852407dde6d2c8d6157658 /graphics/openimageio | |
| parent | 9eb2604b30754490dde6893697c2bd6dfa6ab4c2 (diff) | |
| download | pkgsrc-d9acaf19a3ed2865c2efef4ab2d590b78d02de41.tar.gz | |
Kill one tautological check and disable the register deprecation
warning for clang.
Diffstat (limited to 'graphics/openimageio')
| -rw-r--r-- | graphics/openimageio/Makefile | 7 | ||||
| -rw-r--r-- | graphics/openimageio/distinfo | 3 | ||||
| -rw-r--r-- | graphics/openimageio/patches/patch-libOpenImageIO_formatspec.cpp | 13 |
3 files changed, 21 insertions, 2 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 4e85a809b9b..c7fc2db9820 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/10/12 22:13:44 ryoon Exp $ +# $NetBSD: Makefile,v 1.18 2013/10/14 14:37:30 joerg Exp $ OIIOVER= 1.2.2 DISTNAME= oiio-Release-${OIIOVER} @@ -29,6 +29,11 @@ pre-install: ${RM} -f ${WRKSRC}/include/tbb/tbb_misc.h.orig ${RM} -f ${WRKSRC}/include/tbb/tbb_exception.h.orig +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -Wno-deprecated-register +.endif + .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/hdf5/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index fefba60d0db..fc52696f9ee 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/10/12 22:13:44 ryoon Exp $ +$NetBSD: distinfo,v 1.8 2013/10/14 14:37:30 joerg Exp $ SHA1 (oiio-Release-1.2.2.tar.gz) = bb9505dbdddcac2ea4545bf0258d7637e3056d5c RMD160 (oiio-Release-1.2.2.tar.gz) = dd5c841ca90b6ccc9d7fc25ec2b56424827a6040 @@ -12,6 +12,7 @@ SHA1 (patch-include_pugixml.hpp) = 41bc40c1c11ddbecf9b03ca570718e1cbb08262a SHA1 (patch-include_tbb_tbb__exception.h) = b2e98d44666d8a113dd6f21f2300ffdd8af3e20c SHA1 (patch-include_tbb_tbb__machine.h) = 7d9a196397315e0d39dd2f16139e011ab84c5630 SHA1 (patch-include_tbb_tbb__misc.h) = 27995a9cdb72b182e352b2a649756af2d60fec86 +SHA1 (patch-libOpenImageIO_formatspec.cpp) = 98ad74b8778deb243308a0c8bf17a2cd35015cbb SHA1 (patch-libutil_sysutil.cpp) = b14b13efd313cbca0068fb58758b5d2095e4cd4d SHA1 (patch-make_detectplatform.mk) = a399f09b9280109519a829dbacc1b924a074f4cc SHA1 (patch-psd.imageio_psdinput.cpp) = 9387715224c93aff28bac55bfc54a435d1de7c1f diff --git a/graphics/openimageio/patches/patch-libOpenImageIO_formatspec.cpp b/graphics/openimageio/patches/patch-libOpenImageIO_formatspec.cpp new file mode 100644 index 00000000000..dcfa2fcf0f0 --- /dev/null +++ b/graphics/openimageio/patches/patch-libOpenImageIO_formatspec.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-libOpenImageIO_formatspec.cpp,v 1.1 2013/10/14 14:37:30 joerg Exp $ + +--- libOpenImageIO/formatspec.cpp.orig 2013-10-14 10:55:37.000000000 +0000 ++++ libOpenImageIO/formatspec.cpp +@@ -192,7 +192,7 @@ ImageSpec::format_from_quantize (int qua + quant_max <= std::numeric_limits <int>::max()) { + return TypeDesc::INT; + } else if (quant_min >= 0 && +- (unsigned int) quant_min >= std::numeric_limits <unsigned int>::min() && ++ //(unsigned int) quant_min >= std::numeric_limits <unsigned int>::min() && + quant_max >= 0 && + (unsigned int) quant_max <= std::numeric_limits <unsigned int>::max()) { + return TypeDesc::UINT; |