diff options
Diffstat (limited to 'graphics/openimageio')
20 files changed, 152 insertions, 159 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index c835cb0b843..02c8468b505 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2014/02/12 23:18:02 tron Exp $ +# $NetBSD: Makefile,v 1.23 2014/04/07 12:15:55 ryoon Exp $ -OIIOVER= 1.2.2 +OIIOVER= 1.3.13 DISTNAME= oiio-Release-${OIIOVER} PKGNAME= ${DISTNAME:S/oiio-Release/openimageio/} -PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= -https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz @@ -12,7 +11,7 @@ HOMEPAGE= https://sites.google.com/site/openimageio/ COMMENT= OpenImageIO is a library for reading and writing images LICENSE= modified-bsd -WRKSRC= ${WRKDIR}/${DISTNAME}/src +#WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_CMAKE= yes USE_LANGUAGES= c c++ @@ -23,6 +22,10 @@ CXXFLAGS+= -std=c++0x CMAKE_ARGS+= -DILMBASE_HOME:STRING=${BUILDLINK_PREFIX.ilmbase} CMAKE_ARGS+= -DOPENJPEG_HOME:STRING=${BUILDLINK_PREFIX.openjpeg15} CMAKE_ARGS+= -DOPENEXR_HOME:STRING=${BUILDLINK_PREFIX.openexr} +CMAKE_ARGS+= -DINSTALL_DOCS:BOOL=OFF + +# For redefinition of _rotl macro. +BUILDLINK_TRANSFORM+= rm:-Werror pre-install: ${RM} -f ${WRKSRC}/include/tbb/tbb_machine.h.orig @@ -44,6 +47,7 @@ CXXFLAGS+= -Wno-deprecated-register .include "../../graphics/openjpeg15/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/giflib.buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" BUILDLINK_DEPMETHOD.qt4-tools= build .include "../../x11/qt4-tools/buildlink3.mk" diff --git a/graphics/openimageio/PLIST b/graphics/openimageio/PLIST index ec4e9ace063..1bbeed9f4cb 100644 --- a/graphics/openimageio/PLIST +++ b/graphics/openimageio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/10/12 22:13:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/04/07 12:15:55 ryoon Exp $ bin/iconvert bin/idiff bin/igrep @@ -25,8 +25,10 @@ include/OpenImageIO/osdep.h include/OpenImageIO/paramlist.h include/OpenImageIO/plugin.h include/OpenImageIO/pugiconfig.hpp +include/OpenImageIO/pugixml.cpp include/OpenImageIO/pugixml.hpp include/OpenImageIO/refcnt.h +include/OpenImageIO/string_ref.h include/OpenImageIO/strutil.h include/OpenImageIO/sysutil.h include/OpenImageIO/texture.h @@ -38,8 +40,5 @@ include/OpenImageIO/ustring.h include/OpenImageIO/varyingref.h include/OpenImageIO/version.h lib/libOpenImageIO.so -lib/libOpenImageIO.so.1.2 +lib/libOpenImageIO.so.1.3 lib/libOpenImageIO.so.${PKGVERSION} -share/doc/openimageio/CHANGES -share/doc/openimageio/LICENSE -share/doc/openimageio/openimageio.pdf diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index fc52696f9ee..5a2379bba05 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,19 +1,17 @@ -$NetBSD: distinfo,v 1.8 2013/10/14 14:37:30 joerg Exp $ +$NetBSD: distinfo,v 1.9 2014/04/07 12:15:55 ryoon Exp $ -SHA1 (oiio-Release-1.2.2.tar.gz) = bb9505dbdddcac2ea4545bf0258d7637e3056d5c -RMD160 (oiio-Release-1.2.2.tar.gz) = dd5c841ca90b6ccc9d7fc25ec2b56424827a6040 -Size (oiio-Release-1.2.2.tar.gz) = 12383820 bytes -SHA1 (patch-CMakeLists.txt) = 2923ca84d7981aaaf6494588392444e5ee07f74a -SHA1 (patch-cmake_modules_FindOpenJpeg.cmake) = 20d15c8ee0a25ab631ed39910b6e441d069760c5 -SHA1 (patch-cmake_oiio__macros.cmake) = 016c4792c1dc85a903477f4c72af26577e1b2bb9 -SHA1 (patch-cmake_platform.cmake) = e63ca222249b708c82f77911a04bd609e36eb1dc -SHA1 (patch-dpx.imageio_libdpx_DPXColorConverter.cpp) = 595415e7e2897798df76474dd906e25cdf3a929e -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 -SHA1 (patch-ptex.imageio_ptex_PtexPlatform.h) = 3c32f95181cfcf8c0e67249a4d04f7ea14a5e122 +SHA1 (oiio-Release-1.3.13.tar.gz) = 2d996eacc12ce177c9bf7a946e05dc3f72196264 +RMD160 (oiio-Release-1.3.13.tar.gz) = b00909b1aeb5fb6c767e5f95cf1c1a5ab42995da +Size (oiio-Release-1.3.13.tar.gz) = 14839643 bytes +SHA1 (patch-CMakeLists.txt) = ff83491d09c7c59159a02151419dee763f191f1d +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_include_tbb_tbb__machine.h) = 7e642a6f26193066c4ccae1ae7a4a7f14f9c6641 +SHA1 (patch-src_include_tbb_tbb__misc.h) = b12317c9652c93cf22dbe8bd34f19ac7808f3215 +SHA1 (patch-src_libOpenImageIO_formatspec.cpp) = 489ac7964258cd5f940a89ca217048fc1940ef8a +SHA1 (patch-src_libutil_sysutil.cpp) = 9a0d04259df155ad4d069c744592432be44fe510 +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-CMakeLists.txt b/graphics/openimageio/patches/patch-CMakeLists.txt index 1816e63e6ec..c7c8948cfb7 100644 --- a/graphics/openimageio/patches/patch-CMakeLists.txt +++ b/graphics/openimageio/patches/patch-CMakeLists.txt @@ -1,25 +1,26 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2012/12/03 12:54:14 ryoon Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2014/04/07 12:15:55 ryoon Exp $ * Enable in-tree build * Remove rpath handling ---- CMakeLists.txt.orig 2012-11-16 23:02:42.000000000 +0000 +--- CMakeLists.txt.orig 2014-04-03 06:08:57.000000000 +0000 +++ CMakeLists.txt -@@ -13,10 +13,6 @@ set (CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS T +@@ -13,10 +13,6 @@ endif () message (STATUS "Project source dir = ${PROJECT_SOURCE_DIR}") message (STATUS "Project build dir = ${CMAKE_BINARY_DIR}") --if (${PROJECT_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) +-if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") - message (FATAL_ERROR "Not allowed to run in-source build!") -endif () - - if (NOT CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE "Release") + if (NOT CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE "Release") endif () -@@ -197,25 +193,6 @@ endif() - set (INSTALL_DOCS ON CACHE BOOL "Install documentation") +@@ -217,26 +213,6 @@ endif() + set (INSTALL_DOCS ON CACHE BOOL "Install documentation") +- -########################################################################### -# Rpath handling. -if (CMAKE_SKIP_RPATH) diff --git a/graphics/openimageio/patches/patch-cmake_modules_FindOpenJpeg.cmake b/graphics/openimageio/patches/patch-cmake_modules_FindOpenJpeg.cmake deleted file mode 100644 index 2b61d3d43b3..00000000000 --- a/graphics/openimageio/patches/patch-cmake_modules_FindOpenJpeg.cmake +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cmake_modules_FindOpenJpeg.cmake,v 1.1 2012/12/08 22:47:41 adam Exp $ - -Where to find openjpeg includes. - ---- cmake/modules/FindOpenJpeg.cmake.orig 2012-12-07 21:44:03.000000000 +0000 -+++ cmake/modules/FindOpenJpeg.cmake -@@ -76,7 +76,7 @@ if (OPENJPEG_HOME) - ${OPENJPEG_HOME}/lib64) - set (OpenJpeg_include_paths - ${OpenJpeg_include_paths} -- ${OPENJPEG_HOME}/include) -+ ${OPENJPEG_HOME}/include/openjpeg-1.5) - endif() - - diff --git a/graphics/openimageio/patches/patch-include_pugixml.hpp b/graphics/openimageio/patches/patch-include_pugixml.hpp deleted file mode 100644 index 7d019e03d35..00000000000 --- a/graphics/openimageio/patches/patch-include_pugixml.hpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-include_pugixml.hpp,v 1.2 2013/10/12 22:13:44 ryoon Exp $ - ---- include/pugixml.hpp.orig 2013-09-30 17:25:21.000000000 +0000 -+++ include/pugixml.hpp -@@ -23,6 +23,11 @@ - - - #ifndef PUGIXML_NO_STL -+#include <iterator> -+#include <string> -+#include <istream> -+#include <ostream> -+#if 0 - namespace std - { - struct bidirectional_iterator_tag; -@@ -50,6 +55,7 @@ namespace std - #endif - } - #endif -+#endif - - // Macro for deprecated features - #ifndef PUGIXML_DEPRECATED diff --git a/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h b/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h deleted file mode 100644 index 9e7daaf9d68..00000000000 --- a/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-include_tbb_tbb__exception.h,v 1.1 2013/05/09 13:58:54 joerg Exp $ - ---- include/tbb/tbb_exception.h.orig 2013-02-21 17:10:46.000000000 +0000 -+++ include/tbb/tbb_exception.h -@@ -30,6 +30,7 @@ - #define __TBB_exception_H - - #include "tbb_stddef.h" -+#include <new> - #include <stdexcept> - - #if __TBB_EXCEPTIONS && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND) && !defined(__SUNPRO_CC) diff --git a/graphics/openimageio/patches/patch-libutil_sysutil.cpp b/graphics/openimageio/patches/patch-libutil_sysutil.cpp deleted file mode 100644 index 2c978e5e115..00000000000 --- a/graphics/openimageio/patches/patch-libutil_sysutil.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-libutil_sysutil.cpp,v 1.2 2013/10/12 22:13:44 ryoon Exp $ - -* Treat NetBSD like Linux (I am not sure) - ---- libutil/sysutil.cpp.orig 2013-09-30 17:25:21.000000000 +0000 -+++ libutil/sysutil.cpp -@@ -39,7 +39,7 @@ - # include <sys/ioctl.h> - #endif - --#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) -+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__NetBSD__) - # include <sys/types.h> - # include <sys/resource.h> - # include <sys/sysctl.h> -@@ -150,7 +150,7 @@ Sysutil::this_program_path () - char filename[10240]; - filename[0] = 0; - --#if defined(__linux__) -+#if defined(__linux__) || defined(__NetBSD__) - unsigned int size = sizeof(filename); - int r = readlink ("/proc/self/exe", filename, size); - ASSERT(r < int(size)); // user won't get the right answer if the filename is too long to store diff --git a/graphics/openimageio/patches/patch-ptex.imageio_ptex_PtexPlatform.h b/graphics/openimageio/patches/patch-ptex.imageio_ptex_PtexPlatform.h deleted file mode 100644 index 991d6203df1..00000000000 --- a/graphics/openimageio/patches/patch-ptex.imageio_ptex_PtexPlatform.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ptex.imageio_ptex_PtexPlatform.h,v 1.1 2012/12/03 12:54:15 ryoon Exp $ - -* Treat NetBSD like FreeBSD - ---- ptex.imageio/ptex/PtexPlatform.h.orig 2012-11-16 23:02:42.000000000 +0000 -+++ ptex.imageio/ptex/PtexPlatform.h -@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE - - // linux/unix/posix - #include <stdlib.h> --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) - #include <alloca.h> - #endif - #include <string.h> diff --git a/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenJpeg.cmake b/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenJpeg.cmake new file mode 100644 index 00000000000..aa4db4e0c5d --- /dev/null +++ b/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenJpeg.cmake @@ -0,0 +1,13 @@ +$NetBSD: patch-src_cmake_modules_FindOpenJpeg.cmake,v 1.1 2014/04/07 12:15:55 ryoon Exp $ + +--- src/cmake/modules/FindOpenJpeg.cmake.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/cmake/modules/FindOpenJpeg.cmake +@@ -78,7 +78,7 @@ if (OPENJPEG_HOME) + ${OPENJPEG_HOME}/lib64) + set (OpenJpeg_include_paths + ${OpenJpeg_include_paths} +- ${OPENJPEG_HOME}/include) ++ ${OPENJPEG_HOME}/include/openjpeg-1.5) + endif() + + diff --git a/graphics/openimageio/patches/patch-cmake_oiio__macros.cmake b/graphics/openimageio/patches/patch-src_cmake_oiio__macros.cmake index 266e3463177..dd87566c018 100644 --- a/graphics/openimageio/patches/patch-cmake_oiio__macros.cmake +++ b/graphics/openimageio/patches/patch-src_cmake_oiio__macros.cmake @@ -1,9 +1,7 @@ -$NetBSD: patch-cmake_oiio__macros.cmake,v 1.1 2012/12/03 12:54:14 ryoon Exp $ +$NetBSD: patch-src_cmake_oiio__macros.cmake,v 1.1 2014/04/07 12:15:55 ryoon Exp $ -* Set python interpreter as pkgsrc-provided one - ---- cmake/oiio_macros.cmake.orig 2012-11-16 23:02:42.000000000 +0000 -+++ cmake/oiio_macros.cmake +--- src/cmake/oiio_macros.cmake.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/cmake/oiio_macros.cmake @@ -103,7 +103,7 @@ macro (oiio_add_tests) if (_has_generator_expr) set (_add_test_args NAME ${_testname} diff --git a/graphics/openimageio/patches/patch-cmake_platform.cmake b/graphics/openimageio/patches/patch-src_cmake_platform.cmake index 5f75400b56f..31e8c243524 100644 --- a/graphics/openimageio/patches/patch-cmake_platform.cmake +++ b/graphics/openimageio/patches/patch-src_cmake_platform.cmake @@ -1,9 +1,7 @@ -$NetBSD: patch-cmake_platform.cmake,v 1.3 2013/10/12 22:13:44 ryoon Exp $ +$NetBSD: patch-src_cmake_platform.cmake,v 1.1 2014/04/07 12:15:55 ryoon Exp $ -* Add NetBSD support - ---- cmake/platform.cmake.orig 2013-09-30 17:25:21.000000000 +0000 -+++ cmake/platform.cmake +--- src/cmake/platform.cmake.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/cmake/platform.cmake @@ -28,6 +28,16 @@ if (UNIX) # with arch of i586 or higher set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i586") diff --git a/graphics/openimageio/patches/patch-dpx.imageio_libdpx_DPXColorConverter.cpp b/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp index d30d315dd29..ff6cbccbdae 100644 --- a/graphics/openimageio/patches/patch-dpx.imageio_libdpx_DPXColorConverter.cpp +++ b/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp @@ -1,9 +1,7 @@ -$NetBSD: patch-dpx.imageio_libdpx_DPXColorConverter.cpp,v 1.1 2012/12/08 22:47:41 adam Exp $ +$NetBSD: patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $ -Define 'max' as unsigned int, because 0xFFFFFFFF does not fit in int. - ---- dpx.imageio/libdpx/DPXColorConverter.cpp.orig 2012-12-07 21:29:43.000000000 +0000 -+++ dpx.imageio/libdpx/DPXColorConverter.cpp +--- 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 { } } diff --git a/graphics/openimageio/patches/patch-include_tbb_tbb__machine.h b/graphics/openimageio/patches/patch-src_include_tbb_tbb__machine.h index fbde1f5c109..b0bc10f2d68 100644 --- a/graphics/openimageio/patches/patch-include_tbb_tbb__machine.h +++ b/graphics/openimageio/patches/patch-src_include_tbb_tbb__machine.h @@ -1,7 +1,7 @@ -$NetBSD: patch-include_tbb_tbb__machine.h,v 1.1 2012/12/03 12:54:14 ryoon Exp $ +$NetBSD: patch-src_include_tbb_tbb__machine.h,v 1.1 2014/04/07 12:15:55 ryoon Exp $ ---- include/tbb/tbb_machine.h.orig 2012-11-16 23:02:42.000000000 +0000 -+++ include/tbb/tbb_machine.h +--- src/include/tbb/tbb_machine.h.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/include/tbb/tbb_machine.h @@ -53,7 +53,7 @@ extern "C" __declspec(dllimport) int __s #pragma managed(pop) #endif diff --git a/graphics/openimageio/patches/patch-include_tbb_tbb__misc.h b/graphics/openimageio/patches/patch-src_include_tbb_tbb__misc.h index 03e8a5c9c04..f65c740db06 100644 --- a/graphics/openimageio/patches/patch-include_tbb_tbb__misc.h +++ b/graphics/openimageio/patches/patch-src_include_tbb_tbb__misc.h @@ -1,7 +1,7 @@ -$NetBSD: patch-include_tbb_tbb__misc.h,v 1.1 2012/12/03 12:54:14 ryoon Exp $ +$NetBSD: patch-src_include_tbb_tbb__misc.h,v 1.1 2014/04/07 12:15:55 ryoon Exp $ ---- include/tbb/tbb_misc.h.orig 2012-11-16 23:02:42.000000000 +0000 -+++ include/tbb/tbb_misc.h +--- src/include/tbb/tbb_misc.h.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/include/tbb/tbb_misc.h @@ -42,7 +42,7 @@ #elif defined(__APPLE__) #include <sys/types.h> diff --git a/graphics/openimageio/patches/patch-libOpenImageIO_formatspec.cpp b/graphics/openimageio/patches/patch-src_libOpenImageIO_formatspec.cpp index dcfa2fcf0f0..9eec460bbba 100644 --- a/graphics/openimageio/patches/patch-libOpenImageIO_formatspec.cpp +++ b/graphics/openimageio/patches/patch-src_libOpenImageIO_formatspec.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-libOpenImageIO_formatspec.cpp,v 1.1 2013/10/14 14:37:30 joerg Exp $ +$NetBSD: patch-src_libOpenImageIO_formatspec.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $ ---- libOpenImageIO/formatspec.cpp.orig 2013-10-14 10:55:37.000000000 +0000 -+++ libOpenImageIO/formatspec.cpp +--- src/libOpenImageIO/formatspec.cpp.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/libOpenImageIO/formatspec.cpp @@ -192,7 +192,7 @@ ImageSpec::format_from_quantize (int qua quant_max <= std::numeric_limits <int>::max()) { return TypeDesc::INT; diff --git a/graphics/openimageio/patches/patch-src_libutil_sysutil.cpp b/graphics/openimageio/patches/patch-src_libutil_sysutil.cpp new file mode 100644 index 00000000000..287b01814d2 --- /dev/null +++ b/graphics/openimageio/patches/patch-src_libutil_sysutil.cpp @@ -0,0 +1,64 @@ +$NetBSD: patch-src_libutil_sysutil.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $ + +--- src/libutil/sysutil.cpp.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/libutil/sysutil.cpp +@@ -70,6 +70,12 @@ + # include <sys/ioctl.h> + #endif + ++#ifdef __NetBSD__ ++# include <unistd.h> ++# include <sys/ioctl.h> ++# include <sys/sysctl.h> ++#endif ++ + #include "dassert.h" + + #include "sysutil.h" +@@ -109,6 +115,12 @@ Sysutil::memory_used (bool resident) + return size; + #endif + ++#elif defined(__NetBSD__) ++ struct rusage ru; ++ if(getrusage (RUSAGE_SELF, &ru) == 0) { ++ return (size_t)ru.ru_maxrss * (size_t)1024; ++ } ++ exit(0); + #elif defined(__APPLE__) + // Inspired by: + // http://miknight.blogspot.com/2005/11/resident-set-size-in-mac-os-x.html +@@ -193,7 +205,12 @@ Sysutil::physical_memory () + size_t length = sizeof(physical_memory); + sysctl (mib, 2, &physical_memory, &length, NULL, 0); + return physical_memory; +- ++#elif defined(__NetBSD__) || defined(__OpenBSD__) ++ int mib[1] = {HW_PHYSMEM64}; ++ size_t physical_memory = 0; ++ size_t length = sizeof(physical_memory); ++ sysctl(mib, 2, &physical_memory, &length, NULL, 0); ++ return physical_memory; + #else + // No idea what platform this is + ASSERT (0 && "Need to implement Sysutil::physical_memory on this platform"); +@@ -245,6 +262,10 @@ Sysutil::this_program_path () + size_t cb = sizeof(filename); + int r=1; + sysctl(mib, 4, filename, &cb, NULL, 0); ++#elif defined(__NetBSD__) ++ unsigned int size = sizeof(filename); ++ int r = readlink ("/proc/curproc/exe", filename, size); ++ ASSERT(r < int(size)); // user won't get the right answer if the filename is too long to store + #elif defined(__GNU__) || defined(__OpenBSD__) + int r = 0; + #else +@@ -276,7 +297,7 @@ Sysutil::terminal_columns () + { + int columns = 80; // a decent guess, if we have nothing more to go on + +-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__NetBSD__) + struct winsize w; + ioctl (0, TIOCGWINSZ, &w); + columns = w.ws_col; diff --git a/graphics/openimageio/patches/patch-make_detectplatform.mk b/graphics/openimageio/patches/patch-src_make_detectplatform.mk index 6c6167d37dd..2cb2976f026 100644 --- a/graphics/openimageio/patches/patch-make_detectplatform.mk +++ b/graphics/openimageio/patches/patch-src_make_detectplatform.mk @@ -1,10 +1,7 @@ -$NetBSD: patch-make_detectplatform.mk,v 1.1 2012/12/03 12:54:15 ryoon Exp $ +$NetBSD: patch-src_make_detectplatform.mk,v 1.1 2014/04/07 12:15:55 ryoon Exp $ -* Add amd64 support for NetBSD -* Add NetBSD support - ---- make/detectplatform.mk.orig 2012-11-16 23:02:42.000000000 +0000 -+++ make/detectplatform.mk +--- src/make/detectplatform.mk.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/make/detectplatform.mk @@ -25,7 +25,9 @@ ifneq (${hw},x86) ifneq (${hw},x86_64) ifneq (${hw},i386) diff --git a/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp b/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp index 00c7131edd4..cf96ff939a1 100644 --- a/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp +++ b/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-psd.imageio_psdinput.cpp,v 1.2 2013/07/05 21:34:12 joerg Exp $ +$NetBSD: patch-src_psd.imageio_psdinput.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $ ---- psd.imageio/psdinput.cpp.orig 2013-02-21 17:10:46.000000000 +0000 -+++ psd.imageio/psdinput.cpp -@@ -328,7 +328,7 @@ private: +--- 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; diff --git a/graphics/openimageio/patches/patch-src_ptex.imageio_ptex_PtexPlatform.h b/graphics/openimageio/patches/patch-src_ptex.imageio_ptex_PtexPlatform.h new file mode 100644 index 00000000000..99116a1fde3 --- /dev/null +++ b/graphics/openimageio/patches/patch-src_ptex.imageio_ptex_PtexPlatform.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_ptex.imageio_ptex_PtexPlatform.h,v 1.1 2014/04/07 12:15:55 ryoon Exp $ + +--- src/ptex.imageio/ptex/PtexPlatform.h.orig 2014-04-03 06:08:57.000000000 +0000 ++++ src/ptex.imageio/ptex/PtexPlatform.h +@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + + // linux/unix/posix + #include <stdlib.h> +-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + #include <alloca.h> + #endif + #include <string.h> |