aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2013-11-04 20:01:01 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2013-11-04 20:01:01 +0000
commit36bdeab4f2724f94429cdf5ad346153d6dab43c5 (patch)
tree31fb7733282c08725be886da6e75b1fde1867de5
parentad730d949fb40bbd197ddab1c33e2576f95b2caa (diff)
downloadports-36bdeab4f2724f94429cdf5ad346153d6dab43c5.tar.gz
ports-36bdeab4f2724f94429cdf5ad346153d6dab43c5.zip
Update OpenImageIO to version 1.2.3.
Submitted by: Shane Ambler <FreeBSD@ShaneWare.Biz> (maintainer)
Notes
Notes: svn path=/head/; revision=332767
-rw-r--r--graphics/openimageio/Makefile8
-rw-r--r--graphics/openimageio/distinfo4
-rw-r--r--graphics/openimageio/files/patch-include__fmath.h11
-rw-r--r--graphics/openimageio/files/patch-include_pugixml.hpp25
-rw-r--r--graphics/openimageio/pkg-plist3
5 files changed, 8 insertions, 43 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 1dfa3e6e2793..cf1aed361e88 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= openimageio
-PORTVERSION= 1.2.2
-PORTREVISION?= 1
+PORTVERSION= 1.2.3
+PORTREVISION?= 0
CATEGORIES?= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
@@ -15,7 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= OpenImageIO
GH_PROJECT= oiio
GH_TAGNAME= Release-${PORTVERSION}
-GH_COMMIT= f9d8f1b
+GH_COMMIT= bcdad81
WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src
# fbm also installs bin/idiff
@@ -29,7 +29,7 @@ CMAKE_ARGS= -DBUILDSTATIC:BOOL=OFF \
-DSTOP_ON_WARNING:BOOL=OFF
OPTIONS_DEFINE= DOCS IMAGEVIEWER OCIO
-OPTIONS_DEFAULT= IMAGEVIEWER OCIO
+OPTIONS_DEFAULT= OCIO
OPTIONS_SUB= yes
IMAGEVIEWER_DESC= Build image viewer
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index ac5726f69e5c..4b1c39fe50f4 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openimageio-1.2.2.tar.gz) = 85891b3cac5bcc724ec42b1f46ff990f84ecc3887dd04743ad38961efacf2414
-SIZE (openimageio-1.2.2.tar.gz) = 12383666
+SHA256 (openimageio-1.2.3.tar.gz) = 9d1dd8b332cc2a191f3d60acc68636a0736d1caa535c326554476bef7a88726d
+SIZE (openimageio-1.2.3.tar.gz) = 12380067
diff --git a/graphics/openimageio/files/patch-include__fmath.h b/graphics/openimageio/files/patch-include__fmath.h
deleted file mode 100644
index e82ca4c42506..000000000000
--- a/graphics/openimageio/files/patch-include__fmath.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/fmath.h.orig 2013-01-21 11:39:43.845857535 +1030
-+++ include/fmath.h 2013-01-21 11:39:52.142857433 +1030
-@@ -976,7 +976,7 @@
-
-
- // Functions missing from FreeBSD
--#if (defined(__FreeBSD__) && (__FreeBSD_version < 803000))
-+#if (defined(__FreeBSD__) && (__FreeBSD_version < 802502))
-
- inline float
- log2f (float val) {
diff --git a/graphics/openimageio/files/patch-include_pugixml.hpp b/graphics/openimageio/files/patch-include_pugixml.hpp
deleted file mode 100644
index 18e09b1658e1..000000000000
--- a/graphics/openimageio/files/patch-include_pugixml.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- include/pugixml.hpp.orig 2013-09-30 19:25:21.000000000 +0200
-+++ include/pugixml.hpp 2013-10-27 20:41:36.000000000 +0100
-@@ -27,22 +27,6 @@
- {
- struct bidirectional_iterator_tag;
-
--#ifdef __SUNPRO_CC
-- // Sun C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions
-- template <class _T> class allocator;
-- template <class _charT> struct char_traits;
-- template <class _charT, class _Traits> class basic_istream;
-- template <class _charT, class _Traits> class basic_ostream;
-- template <class _charT, class _Traits, class _Allocator> class basic_string;
--#else
-- // Borland C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions
-- template <class _Ty> class allocator;
-- template <class _Ty> struct char_traits;
-- template <class _Elem, class _Traits> class basic_istream;
-- template <class _Elem, class _Traits> class basic_ostream;
-- template <class _Elem, class _Traits, class _Ax> class basic_string;
--#endif
--
- // Digital Mars compiler has a bug which requires a forward declaration for explicit instantiation (otherwise type selection is messed up later, producing link errors)
- // Also note that we have to declare char_traits as a class here, since it's defined that way
- #ifdef __DMC__
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index b2166749717c..0d5a61cc73d4 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -34,12 +34,13 @@ include/OpenImageIO/typedesc.h
include/OpenImageIO/ustring.h
include/OpenImageIO/varyingref.h
include/OpenImageIO/pugixml.hpp
+include/OpenImageIO/pugixml.cpp
include/OpenImageIO/pugiconfig.hpp
include/OpenImageIO/version.h
lib/libOpenImageIO.so
lib/libOpenImageIO.so.1
lib/libOpenImageIO.so.1.2
-lib/libOpenImageIO.so.1.2.2
+lib/libOpenImageIO.so.1.2.3
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf