diff options
| -rw-r--r-- | graphics/openimageio/Makefile | 6 | ||||
| -rw-r--r-- | graphics/openimageio/PLIST | 9 | ||||
| -rw-r--r-- | graphics/openimageio/distinfo | 13 | ||||
| -rw-r--r-- | graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp | 94 | ||||
| -rw-r--r-- | graphics/openimageio/patches/patch-src_gif.imageio_gifinput.cpp | 13 | ||||
| -rw-r--r-- | graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp | 13 |
6 files changed, 13 insertions, 135 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index a58d7e6bd2c..3a9c36e47a8 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2015/04/25 14:23:17 tnn Exp $ +# $NetBSD: Makefile,v 1.36 2015/12/15 09:29:04 markd Exp $ -OIIOVER= 1.4.10 +OIIOVER= 1.5.16 DISTNAME= oiio-Release-${OIIOVER} PKGNAME= ${DISTNAME:S/oiio-Release/openimageio/} -PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= -https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz @@ -16,7 +15,6 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake -CXXFLAGS+= -std=c++0x CXXFLAGS.Linux+= -pthread CMAKE_ARGS+= -DILMBASE_HOME:STRING=${BUILDLINK_PREFIX.ilmbase} diff --git a/graphics/openimageio/PLIST b/graphics/openimageio/PLIST index 97fb3b1506c..94ea3e0f43e 100644 --- a/graphics/openimageio/PLIST +++ b/graphics/openimageio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/07/09 20:00:01 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/12/15 09:29:04 markd Exp $ bin/iconvert bin/idiff bin/igrep @@ -23,15 +23,18 @@ include/OpenImageIO/imagebufalgo.h include/OpenImageIO/imagebufalgo_util.h include/OpenImageIO/imagecache.h include/OpenImageIO/imageio.h +include/OpenImageIO/missing_math.h include/OpenImageIO/oiioversion.h include/OpenImageIO/optparser.h include/OpenImageIO/osdep.h include/OpenImageIO/paramlist.h +include/OpenImageIO/platform.h include/OpenImageIO/plugin.h include/OpenImageIO/pugiconfig.hpp include/OpenImageIO/pugixml.cpp include/OpenImageIO/pugixml.hpp include/OpenImageIO/refcnt.h +include/OpenImageIO/simd.h include/OpenImageIO/strided_ptr.h include/OpenImageIO/string_ref.h include/OpenImageIO/string_view.h @@ -48,8 +51,8 @@ include/OpenImageIO/ustring.h include/OpenImageIO/varyingref.h include/OpenImageIO/version.h lib/libOpenImageIO.so -lib/libOpenImageIO.so.1.4 +lib/libOpenImageIO.so.1.5 lib/libOpenImageIO.so.${PKGVERSION} lib/libOpenImageIO_Util.so -lib/libOpenImageIO_Util.so.1.4 +lib/libOpenImageIO_Util.so.1.5 lib/libOpenImageIO_Util.so.${PKGVERSION} diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index 7698d8caf8c..83d65156b88 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,16 +1,13 @@ -$NetBSD: distinfo,v 1.12 2015/11/03 21:34:11 agc Exp $ +$NetBSD: distinfo,v 1.13 2015/12/15 09:29:04 markd Exp $ -SHA1 (oiio-Release-1.4.10.tar.gz) = b02b238c4b41e33fb070300d1017fd533c703bf7 -RMD160 (oiio-Release-1.4.10.tar.gz) = e86ba7f7aba8e8ed67a85b3d0ecb84c8107854e8 -SHA512 (oiio-Release-1.4.10.tar.gz) = 9565544f20aac2dd0dd9940f9a615899255cf0a6a242a7ece6eeb4f509f60b0f48d3a837da5b758ab31fcec525c59a1950d2c9b7b50d05ba84cda4214c24765e -Size (oiio-Release-1.4.10.tar.gz) = 17535558 bytes +SHA1 (oiio-Release-1.5.16.tar.gz) = 9e067be3bd191841faaa39352fee66a22352db19 +RMD160 (oiio-Release-1.5.16.tar.gz) = b4d17be7e2d074b2e5a936834c5540242f7603e7 +SHA512 (oiio-Release-1.5.16.tar.gz) = 8ecf2b42875b05aa72a227e56f8c247560d8e53505d51812449afa57db39e7c8425c1fdfa87a08b22c0592a24e457fba4b98ad91642168e45d99753ca4cf7b8e +Size (oiio-Release-1.5.16.tar.gz) = 23136543 bytes SHA1 (patch-CMakeLists.txt) = cce7fabfd51526847ea964fa7fd5ca3e8a6b08e7 SHA1 (patch-src_cmake_modules_FindOpenJpeg.cmake) = 5c68708dc0c987c27719e63ab634bcdcde4d7bee SHA1 (patch-src_cmake_oiio__macros.cmake) = 37962a7256e1e82b6ffa1b16bfc771ea3812fae3 SHA1 (patch-src_cmake_platform.cmake) = b7c8f459499563f6aeb0de270087d1993db67af3 -SHA1 (patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp) = e758c6fc1960575f6471c28f03180031875cdf5d -SHA1 (patch-src_gif.imageio_gifinput.cpp) = 5a4d0879c202e861c252a3c46bfcafdf41f48a68 SHA1 (patch-src_libutil_sysutil.cpp) = 6a4418cd4557d036fd94b747a7630bdce0abd4be SHA1 (patch-src_make_detectplatform.mk) = d62c332ad559cca3a5f135bc8cdd69cc89a6c196 -SHA1 (patch-src_psd.imageio_psdinput.cpp) = 9a0678f39762883f04a28ec143e3c026b73955d9 SHA1 (patch-src_ptex.imageio_ptex_PtexPlatform.h) = 9fad164cda52e35d42128a55d63057dae8ddac35 diff --git a/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp b/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp deleted file mode 100644 index ff6cbccbdae..00000000000 --- a/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $ - ---- src/dpx.imageio/libdpx/DPXColorConverter.cpp.orig 2014-04-03 06:08:57.000000000 +0000 -+++ src/dpx.imageio/libdpx/DPXColorConverter.cpp -@@ -90,7 +90,7 @@ namespace dpx { - } - } - -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static inline void ConvertPixelYCbCrToRGB(const DATA CbYCr[3], DATA RGB[3], const float matrix[9]) { - float tmp; - for (int i = 0; i < 3; i++) { -@@ -106,7 +106,7 @@ namespace dpx { - } - - // 4:4:4 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertCbYCrToRGB(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetYCbCrToRGBColorMatrix(space); - if (matrix == NULL) -@@ -120,7 +120,7 @@ namespace dpx { - } - - // 4:4:4:4 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertCbYCrAToRGBA(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetYCbCrToRGBColorMatrix(space); - if (matrix == NULL) -@@ -135,7 +135,7 @@ namespace dpx { - } - - // 4:2:2 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertCbYCrYToRGB(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetYCbCrToRGBColorMatrix(space); - if (matrix == NULL) -@@ -154,7 +154,7 @@ namespace dpx { - } - - // 4:2:2:4 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertCbYACrYAToRGBA(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetYCbCrToRGBColorMatrix(space); - if (matrix == NULL) -@@ -390,7 +390,7 @@ namespace dpx { - } - } - -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static inline void ConvertPixelRGBToYCbCr(const DATA RGB[3], DATA CbYCr[3], const float matrix[9]) { - float tmp; - for (int i = 0; i < 3; i++) { -@@ -407,7 +407,7 @@ namespace dpx { - } - - // 4:4:4 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertRGBToCbYCr(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetRGBToYCbCrColorMatrix(space); - if (matrix == NULL) -@@ -421,7 +421,7 @@ namespace dpx { - } - - // 4:4:4:4 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertRGBAToCbYCrA(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetRGBToYCbCrColorMatrix(space); - if (matrix == NULL) -@@ -436,7 +436,7 @@ namespace dpx { - } - - // 4:2:2 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertRGBToCbYCrY(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetRGBToYCbCrColorMatrix(space); - if (matrix == NULL) -@@ -454,7 +454,7 @@ namespace dpx { - } - - // 4:2:2:4 -- template <typename DATA, int max> -+ template <typename DATA, unsigned int max> - static bool ConvertRGBAToCbYACrYA(const Characteristic space, const DATA *input, DATA *output, const int pixels) { - const float *matrix = GetRGBToYCbCrColorMatrix(space); - if (matrix == NULL) diff --git a/graphics/openimageio/patches/patch-src_gif.imageio_gifinput.cpp b/graphics/openimageio/patches/patch-src_gif.imageio_gifinput.cpp deleted file mode 100644 index bd74a667878..00000000000 --- a/graphics/openimageio/patches/patch-src_gif.imageio_gifinput.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_gif.imageio_gifinput.cpp,v 1.1 2014/05/30 11:33:32 joerg Exp $ - ---- src/gif.imageio/gifinput.cpp.orig 2014-05-28 13:28:44.000000000 +0000 -+++ src/gif.imageio/gifinput.cpp -@@ -497,7 +497,7 @@ inline bool - GIFInput::close (void) - { - if (m_gif_file) { -- if (DGifCloseFile (m_gif_file) == GIF_ERROR) { -+ if (DGifCloseFile (m_gif_file, NULL) == GIF_ERROR) { - error ("Error trying to close the file."); - return false; - } diff --git a/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp b/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp deleted file mode 100644 index cf96ff939a1..00000000000 --- a/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_psd.imageio_psdinput.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $ - ---- src/psd.imageio/psdinput.cpp.orig 2014-04-03 06:08:57.000000000 +0000 -+++ src/psd.imageio/psdinput.cpp -@@ -389,7 +389,7 @@ private: - // For debugging, numeric_cast will throw if precision is lost: - // value = boost::numeric_cast<TVariable>(buffer); - value = buffer; -- return m_file; -+ return !m_file.bad(); - } - - int read_pascal_string (std::string &s, uint16_t mod_padding); |