[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.2.3_dfsg0-1-18-gde40ace
Matteo F. Vescovi
mfvescovi at gmail.com
Thu Jan 23 08:49:57 UTC 2014
The following commit has been merged in the master branch:
commit e1ef79245e0ba6f6779ff2c5eddb93e8e79eeaaa
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date: Thu Jan 23 08:51:37 2014 +0100
debian/patches/: patchset updated
- 0002-Fix_IlmBase_issue.patch refreshed
- 0005-Fix_FTBFS_due_to_OpenEXR.patch added
diff --git a/debian/patches/0002-Fix_IlmBase_issue.patch b/debian/patches/0002-Fix_IlmBase_issue.patch
index a7b83ad..e7bf555 100644
--- a/debian/patches/0002-Fix_IlmBase_issue.patch
+++ b/debian/patches/0002-Fix_IlmBase_issue.patch
@@ -9,10 +9,10 @@ on kFreeBSD and Hurd, besides Linux.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 00f347d..79ecece 100644
+index 79b5108..862dbd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -77,7 +77,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
+@@ -82,7 +82,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
# Turn default symbol visibility to hidden
set (VISIBILITY_COMMAND "-fvisibility=hidden -fvisibility-inlines-hidden")
add_definitions (${VISIBILITY_COMMAND})
diff --git a/debian/patches/0005-Fix_FTBFS_due_to_OpenEXR.patch b/debian/patches/0005-Fix_FTBFS_due_to_OpenEXR.patch
new file mode 100644
index 0000000..b2cb6c3
--- /dev/null
+++ b/debian/patches/0005-Fix_FTBFS_due_to_OpenEXR.patch
@@ -0,0 +1,207 @@
+From: Larry Gritz <lg at larrygritz.com>
+Date: Thu, 23 Jan 2014 08:50:13 +0100
+Subject: Fix_FTBFS_due_to_OpenEXR
+
+---
+ src/openexr.imageio/exrinput.cpp | 11 +++++++----
+ src/openexr.imageio/exroutput.cpp | 19 ++++++++++++++++---
+ 2 files changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/src/openexr.imageio/exrinput.cpp b/src/openexr.imageio/exrinput.cpp
+index fbdc7b3..191a72c 100644
+--- a/src/openexr.imageio/exrinput.cpp
++++ b/src/openexr.imageio/exrinput.cpp
+@@ -54,7 +54,6 @@
+ #include <OpenEXR/ImfVecAttribute.h>
+ #include <OpenEXR/ImfBoxAttribute.h>
+ #include <OpenEXR/ImfStringAttribute.h>
+-#include <OpenEXR/ImfStringVectorAttribute.h>
+ #include <OpenEXR/ImfTimeCodeAttribute.h>
+ #include <OpenEXR/ImfKeyCodeAttribute.h>
+ #include <OpenEXR/ImfEnvmapAttribute.h>
+@@ -62,6 +61,7 @@
+ #include <OpenEXR/IexBaseExc.h>
+ #include <OpenEXR/IexThrowErrnoExc.h>
+ #ifdef USE_OPENEXR_VERSION2
++#include <OpenEXR/ImfStringVectorAttribute.h>
+ #include <OpenEXR/ImfPartType.h>
+ #include <OpenEXR/ImfMultiPartInputFile.h>
+ #include <OpenEXR/ImfInputPart.h>
+@@ -236,7 +236,7 @@ openexr_input_imageio_create ()
+ // OIIO_EXPORT int openexr_imageio_version = OIIO_PLUGIN_VERSION; // it's in exroutput.cpp
+
+ OIIO_EXPORT const char * openexr_input_extensions[] = {
+- "exr", NULL
++ "exr", "sxr", "mxr", NULL
+ };
+
+ OIIO_PLUGIN_EXPORTS_END
+@@ -537,11 +537,13 @@ OpenEXRInput::PartInfo::parse_header (const Imf::Header *header)
+ const Imf::V3iAttribute *v3iattr;
+ const Imf::V2fAttribute *v2fattr;
+ const Imf::V2iAttribute *v2iattr;
+- const Imf::StringVectorAttribute *svattr;
+ const Imf::Box2iAttribute *b2iattr;
+ const Imf::Box2fAttribute *b2fattr;
+ const Imf::TimeCodeAttribute *tattr;
+ const Imf::KeyCodeAttribute *kcattr;
++#ifdef USE_OPENEXR_VERSION2
++ const Imf::StringVectorAttribute *svattr;
++#endif
+ const char *name = hit.name();
+ std::string oname = exr_tag_to_ooio_std[name];
+ if (oname.empty()) // Empty string means skip this attrib
+@@ -580,6 +582,7 @@ OpenEXRInput::PartInfo::parse_header (const Imf::Header *header)
+ TypeDesc v2 (TypeDesc::INT,TypeDesc::VEC2);
+ spec.attribute (oname, v2, &(v2iattr->value()));
+ }
++#ifdef USE_OPENEXR_VERSION2
+ else if (type == "stringvector" &&
+ (svattr = header->findTypedAttribute<Imf::StringVectorAttribute> (name))) {
+ std::vector<std::string> strvec = svattr->value();
+@@ -589,6 +592,7 @@ OpenEXRInput::PartInfo::parse_header (const Imf::Header *header)
+ TypeDesc sv (TypeDesc::STRING, ustrvec.size());
+ spec.attribute(oname, sv, &ustrvec[0]);
+ }
++#endif
+ else if (type == "box2i" &&
+ (b2iattr = header->findTypedAttribute<Imf::Box2iAttribute> (name))) {
+ TypeDesc bx (TypeDesc::INT, TypeDesc::VEC2, 2);
+@@ -1215,4 +1219,3 @@ OpenEXRInput::read_native_deep_tiles (int xbegin, int xend,
+
+
+ OIIO_PLUGIN_NAMESPACE_END
+-
+diff --git a/src/openexr.imageio/exroutput.cpp b/src/openexr.imageio/exroutput.cpp
+index 2f250d2..8b7262a 100644
+--- a/src/openexr.imageio/exroutput.cpp
++++ b/src/openexr.imageio/exroutput.cpp
+@@ -51,7 +51,6 @@
+ #include <OpenEXR/ImfMatrixAttribute.h>
+ #include <OpenEXR/ImfVecAttribute.h>
+ #include <OpenEXR/ImfStringAttribute.h>
+-#include <OpenEXR/ImfStringVectorAttribute.h>
+ #include <OpenEXR/ImfTimeCodeAttribute.h>
+ #include <OpenEXR/ImfKeyCodeAttribute.h>
+ #include <OpenEXR/ImfBoxAttribute.h>
+@@ -69,6 +68,7 @@
+ #define OPENEXR_VERSION_IS_1_6_OR_LATER
+ #endif
+ #ifdef USE_OPENEXR_VERSION2
++#include <OpenEXR/ImfStringVectorAttribute.h>
+ #include <OpenEXR/ImfMultiPartOutputFile.h>
+ #include <OpenEXR/ImfPartType.h>
+ #include <OpenEXR/ImfOutputPart.h>
+@@ -230,7 +230,7 @@ openexr_output_imageio_create ()
+ OIIO_EXPORT int openexr_imageio_version = OIIO_PLUGIN_VERSION;
+
+ OIIO_EXPORT const char * openexr_output_extensions[] = {
+- "exr", NULL
++ "exr", "sxr", "mxr", NULL
+ };
+
+ OIIO_PLUGIN_EXPORTS_END
+@@ -892,6 +892,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ case TypeDesc::FLOAT:
+ header.insert (xname.c_str(), Imf::V2fAttribute (*(Imath::V2f*)data));
+ return true;
++#ifdef USE_OPENEXR_VERSION2
+ case TypeDesc::DOUBLE:
+ header.insert (xname.c_str(), Imf::V2dAttribute (*(Imath::V2d*)data));
+ return true;
+@@ -901,6 +902,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ v.push_back(((std::string*)data)[1]);
+ header.insert (xname.c_str(), Imf::StringVectorAttribute (v));
+ return true;
++#endif
+ }
+ }
+ if (type.aggregate == TypeDesc::VEC3) {
+@@ -913,6 +915,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ case TypeDesc::FLOAT:
+ header.insert (xname.c_str(), Imf::V3fAttribute (*(Imath::V3f*)data));
+ return true;
++#ifdef USE_OPENEXR_VERSION2
+ case TypeDesc::DOUBLE:
+ header.insert (xname.c_str(), Imf::V3dAttribute (*(Imath::V3d*)data));
+ return true;
+@@ -923,6 +926,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ v.push_back(((std::string*)data)[2]);
+ header.insert (xname.c_str(), Imf::StringVectorAttribute (v));
+ return true;
++#endif
+ }
+ }
+ if (type.aggregate == TypeDesc::MATRIX44) {
+@@ -930,9 +934,11 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ case TypeDesc::FLOAT:
+ header.insert (xname.c_str(), Imf::M44fAttribute (*(Imath::M44f*)data));
+ return true;
++#ifdef USE_OPENEXR_VERSION2
+ case TypeDesc::DOUBLE:
+ header.insert (xname.c_str(), Imf::M44dAttribute (*(Imath::M44d*)data));
+ return true;
++#endif
+ }
+ }
+ }
+@@ -981,6 +987,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ case TypeDesc::FLOAT:
+ header.insert (xname.c_str(), Imf::V2fAttribute (*(Imath::V2f*)data));
+ return true;
++#ifdef USE_OPENEXR_VERSION2
+ case TypeDesc::DOUBLE:
+ header.insert (xname.c_str(), Imf::V2dAttribute (*(Imath::V2d*)data));
+ return true;
+@@ -990,6 +997,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ v.push_back(((std::string*)data)[1]);
+ header.insert (xname.c_str(), Imf::StringVectorAttribute (v));
+ return true;
++#endif
+ }
+ }
+ // Vec3
+@@ -1003,6 +1011,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ case TypeDesc::FLOAT:
+ header.insert (xname.c_str(), Imf::V3fAttribute (*(Imath::V3f*)data));
+ return true;
++#ifdef USE_OPENEXR_VERSION2
+ case TypeDesc::DOUBLE:
+ header.insert (xname.c_str(), Imf::V3dAttribute (*(Imath::V3d*)data));
+ return true;
+@@ -1013,6 +1022,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ v.push_back(((std::string*)data)[2]);
+ header.insert (xname.c_str(), Imf::StringVectorAttribute (v));
+ return true;
++#endif
+ }
+ }
+ // Matrix
+@@ -1021,11 +1031,14 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ case TypeDesc::FLOAT:
+ header.insert (xname.c_str(), Imf::M44fAttribute (*(Imath::M44f*)data));
+ return true;
++#ifdef USE_OPENEXR_VERSION2
+ case TypeDesc::DOUBLE:
+ header.insert (xname.c_str(), Imf::M44dAttribute (*(Imath::M44d*)data));
+ return true;
++#endif
+ }
+ }
++#ifdef USE_OPENEXR_VERSION2
+ // String Vector
+ else if (type.basetype == TypeDesc::STRING) {
+ Imf::StringVector v;
+@@ -1035,6 +1048,7 @@ OpenEXROutput::put_parameter (const std::string &name, TypeDesc type,
+ header.insert (xname.c_str(), Imf::StringVectorAttribute (v));
+ return true;
+ }
++#endif
+ }
+
+
+@@ -1455,4 +1469,3 @@ OpenEXROutput::write_deep_tiles (int xbegin, int xend, int ybegin, int yend,
+
+
+ OIIO_PLUGIN_NAMESPACE_END
+-
diff --git a/debian/patches/series b/debian/patches/series
index a340afe..5bc7e29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-Fix_IlmBase_issue.patch
0003-Fix_multiarch_paths.patch
0004-Fix_FTBFS_on_atomic_operations.patch
+0005-Fix_FTBFS_due_to_OpenEXR.patch
--
OpenImageIO packaging
More information about the Pkg-phototools-commits
mailing list