summaryrefslogtreecommitdiff
path: root/graphics/openimageio
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/openimageio')
-rw-r--r--graphics/openimageio/Makefile12
-rw-r--r--graphics/openimageio/PLIST15
-rw-r--r--graphics/openimageio/distinfo15
-rw-r--r--graphics/openimageio/patches/patch-CMakeLists.txt13
-rw-r--r--graphics/openimageio/patches/patch-src_include_tbb_tbb__machine.h13
-rw-r--r--graphics/openimageio/patches/patch-src_include_tbb_tbb__misc.h27
-rw-r--r--graphics/openimageio/patches/patch-src_libOpenImageIO_formatspec.cpp13
-rw-r--r--graphics/openimageio/patches/patch-src_libutil_sysutil.cpp16
8 files changed, 30 insertions, 94 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 86cc2702afa..6bf932a30fd 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/05/31 15:56:27 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/07/09 20:00:01 ryoon Exp $
-OIIOVER= 1.3.13
+OIIOVER= 1.4.10
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,8 +11,6 @@ HOMEPAGE= https://sites.google.com/site/openimageio/
COMMENT= OpenImageIO is a library for reading and writing images
LICENSE= modified-bsd
-#WRKSRC= ${WRKDIR}/${DISTNAME}/src
-
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
@@ -28,11 +25,6 @@ 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
- ${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
diff --git a/graphics/openimageio/PLIST b/graphics/openimageio/PLIST
index 1bbeed9f4cb..97fb3b1506c 100644
--- a/graphics/openimageio/PLIST
+++ b/graphics/openimageio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/04/07 12:15:55 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/07/09 20:00:01 ryoon Exp $
bin/iconvert
bin/idiff
bin/igrep
@@ -6,7 +6,9 @@ bin/iinfo
bin/iv
bin/maketx
bin/oiiotool
+include/OpenImageIO/SHA1.h
include/OpenImageIO/argparse.h
+include/OpenImageIO/array_view.h
include/OpenImageIO/color.h
include/OpenImageIO/dassert.h
include/OpenImageIO/errorhandler.h
@@ -15,11 +17,13 @@ include/OpenImageIO/filesystem.h
include/OpenImageIO/filter.h
include/OpenImageIO/fmath.h
include/OpenImageIO/hash.h
+include/OpenImageIO/image_view.h
include/OpenImageIO/imagebuf.h
include/OpenImageIO/imagebufalgo.h
include/OpenImageIO/imagebufalgo_util.h
include/OpenImageIO/imagecache.h
include/OpenImageIO/imageio.h
+include/OpenImageIO/oiioversion.h
include/OpenImageIO/optparser.h
include/OpenImageIO/osdep.h
include/OpenImageIO/paramlist.h
@@ -28,7 +32,9 @@ include/OpenImageIO/pugiconfig.hpp
include/OpenImageIO/pugixml.cpp
include/OpenImageIO/pugixml.hpp
include/OpenImageIO/refcnt.h
+include/OpenImageIO/strided_ptr.h
include/OpenImageIO/string_ref.h
+include/OpenImageIO/string_view.h
include/OpenImageIO/strutil.h
include/OpenImageIO/sysutil.h
include/OpenImageIO/texture.h
@@ -36,9 +42,14 @@ include/OpenImageIO/thread.h
include/OpenImageIO/timer.h
include/OpenImageIO/tinyformat.h
include/OpenImageIO/typedesc.h
+include/OpenImageIO/unittest.h
+include/OpenImageIO/unordered_map_concurrent.h
include/OpenImageIO/ustring.h
include/OpenImageIO/varyingref.h
include/OpenImageIO/version.h
lib/libOpenImageIO.so
-lib/libOpenImageIO.so.1.3
+lib/libOpenImageIO.so.1.4
lib/libOpenImageIO.so.${PKGVERSION}
+lib/libOpenImageIO_Util.so
+lib/libOpenImageIO_Util.so.1.4
+lib/libOpenImageIO_Util.so.${PKGVERSION}
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 390d8e5c71e..5bf56bd35d7 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.10 2014/05/30 11:33:32 joerg Exp $
+$NetBSD: distinfo,v 1.11 2014/07/09 20:00:01 ryoon Exp $
-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 (oiio-Release-1.4.10.tar.gz) = b02b238c4b41e33fb070300d1017fd533c703bf7
+RMD160 (oiio-Release-1.4.10.tar.gz) = e86ba7f7aba8e8ed67a85b3d0ecb84c8107854e8
+Size (oiio-Release-1.4.10.tar.gz) = 17535558 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_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_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-CMakeLists.txt b/graphics/openimageio/patches/patch-CMakeLists.txt
index c7c8948cfb7..ce41a7ec02d 100644
--- a/graphics/openimageio/patches/patch-CMakeLists.txt
+++ b/graphics/openimageio/patches/patch-CMakeLists.txt
@@ -1,21 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2014/04/07 12:15:55 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2014/07/09 20:00:01 ryoon Exp $
* Enable in-tree build
* Remove rpath handling
--- CMakeLists.txt.orig 2014-04-03 06:08:57.000000000 +0000
+++ CMakeLists.txt
-@@ -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}")
-- message (FATAL_ERROR "Not allowed to run in-source build!")
--endif ()
--
- if (NOT CMAKE_BUILD_TYPE)
- set (CMAKE_BUILD_TYPE "Release")
- endif ()
@@ -217,26 +213,6 @@ endif()
set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
diff --git a/graphics/openimageio/patches/patch-src_include_tbb_tbb__machine.h b/graphics/openimageio/patches/patch-src_include_tbb_tbb__machine.h
deleted file mode 100644
index b0bc10f2d68..00000000000
--- a/graphics/openimageio/patches/patch-src_include_tbb_tbb__machine.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_include_tbb_tbb__machine.h,v 1.1 2014/04/07 12:15:55 ryoon Exp $
-
---- 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
-
--#elif __linux__ || __FreeBSD__
-+#elif __linux__ || __FreeBSD__ || __NetBSD__
-
- #if __i386__
- #include "machine/linux_ia32.h"
diff --git a/graphics/openimageio/patches/patch-src_include_tbb_tbb__misc.h b/graphics/openimageio/patches/patch-src_include_tbb_tbb__misc.h
deleted file mode 100644
index f65c740db06..00000000000
--- a/graphics/openimageio/patches/patch-src_include_tbb_tbb__misc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_include_tbb_tbb__misc.h,v 1.1 2014/04/07 12:15:55 ryoon Exp $
-
---- 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>
- #include <sys/sysctl.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
- #include <unistd.h>
- #endif
-
-@@ -64,11 +64,11 @@ static inline int DetectNumberOfWorkers(
- return static_cast<int>(si.dwNumberOfProcessors);
- }
-
--#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
-+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) || defined(__NetBSD__)
- static inline int DetectNumberOfWorkers() {
- long number_of_workers;
-
--#if (defined(__FreeBSD__) || defined(__sun)) && defined(_SC_NPROCESSORS_ONLN)
-+#if (defined(__FreeBSD__) || defined(__sun) || defined(__NetBSD__)) && defined(_SC_NPROCESSORS_ONLN)
- number_of_workers = sysconf(_SC_NPROCESSORS_ONLN);
-
- // In theory, sysconf should work everywhere.
diff --git a/graphics/openimageio/patches/patch-src_libOpenImageIO_formatspec.cpp b/graphics/openimageio/patches/patch-src_libOpenImageIO_formatspec.cpp
deleted file mode 100644
index 9eec460bbba..00000000000
--- a/graphics/openimageio/patches/patch-src_libOpenImageIO_formatspec.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_libOpenImageIO_formatspec.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
-
---- 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;
- } 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;
diff --git a/graphics/openimageio/patches/patch-src_libutil_sysutil.cpp b/graphics/openimageio/patches/patch-src_libutil_sysutil.cpp
index 287b01814d2..c483ea4d895 100644
--- a/graphics/openimageio/patches/patch-src_libutil_sysutil.cpp
+++ b/graphics/openimageio/patches/patch-src_libutil_sysutil.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_libutil_sysutil.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
+$NetBSD: patch-src_libutil_sysutil.cpp,v 1.2 2014/07/09 20:00:01 ryoon Exp $
---- src/libutil/sysutil.cpp.orig 2014-04-03 06:08:57.000000000 +0000
+--- src/libutil/sysutil.cpp.orig 2014-06-21 06:21:09.000000000 +0000
+++ src/libutil/sysutil.cpp
@@ -70,6 +70,12 @@
# include <sys/ioctl.h>
@@ -12,10 +12,10 @@ $NetBSD: patch-src_libutil_sysutil.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
+# include <sys/sysctl.h>
+#endif
+
- #include "dassert.h"
+ #include "OpenImageIO/dassert.h"
+ #include "OpenImageIO/sysutil.h"
- #include "sysutil.h"
-@@ -109,6 +115,12 @@ Sysutil::memory_used (bool resident)
+@@ -108,6 +114,12 @@ Sysutil::memory_used (bool resident)
return size;
#endif
@@ -28,7 +28,7 @@ $NetBSD: patch-src_libutil_sysutil.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
#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 ()
+@@ -192,7 +204,12 @@ Sysutil::physical_memory ()
size_t length = sizeof(physical_memory);
sysctl (mib, 2, &physical_memory, &length, NULL, 0);
return physical_memory;
@@ -42,7 +42,7 @@ $NetBSD: patch-src_libutil_sysutil.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
#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 ()
+@@ -244,6 +261,10 @@ Sysutil::this_program_path ()
size_t cb = sizeof(filename);
int r=1;
sysctl(mib, 4, filename, &cb, NULL, 0);
@@ -53,7 +53,7 @@ $NetBSD: patch-src_libutil_sysutil.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
#elif defined(__GNU__) || defined(__OpenBSD__)
int r = 0;
#else
-@@ -276,7 +297,7 @@ Sysutil::terminal_columns ()
+@@ -275,7 +296,7 @@ Sysutil::terminal_columns ()
{
int columns = 80; // a decent guess, if we have nothing more to go on
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 04:36:49 +0000