summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-11-24 21:40:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-11-24 21:40:40 +0000
commit1c4636695eef35ed8530c0f8ad8f3d593970772f (patch)
tree031d6e47a4f54b4debdf9b008a8f9347243fb298 /media-gfx/opencolorio/files
parentMask/unmask python_single_target use-expand values. (diff)
downloadgentoo-2-1c4636695eef35ed8530c0f8ad8f3d593970772f.tar.gz
gentoo-2-1c4636695eef35ed8530c0f8ad8f3d593970772f.tar.bz2
gentoo-2-1c4636695eef35ed8530c0f8ad8f3d593970772f.zip
Fix building with current openimageio
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-gfx/opencolorio/files')
-rw-r--r--media-gfx/opencolorio/files/opencolorio-openimageio.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/media-gfx/opencolorio/files/opencolorio-openimageio.patch b/media-gfx/opencolorio/files/opencolorio-openimageio.patch
new file mode 100644
index 000000000000..89b7042d47f8
--- /dev/null
+++ b/media-gfx/opencolorio/files/opencolorio-openimageio.patch
@@ -0,0 +1,38 @@
+http://github.com/cjwills/OpenColorIO/commit/36c59cb788adc20219f6086bccd893531d0cec43
+
+--- src/apps/ocioconvert/main.cpp
++++ src/apps/ocioconvert/main.cpp
+@@ -35,7 +35,9 @@
+
+ #include <OpenImageIO/imageio.h>
+ #include <OpenImageIO/typedesc.h>
++#if defined OIIO_VERSION && (OIIO_VERSION<10100)
+ namespace OIIO = OIIO_NAMESPACE;
++#endif
+
+ #include "argparse.h"
+
+--- src/apps/ociodisplay/main.cpp
++++ src/apps/ociodisplay/main.cpp
+@@ -53,7 +53,9 @@
+
+ #include <OpenImageIO/imageio.h>
+ #include <OpenImageIO/typedesc.h>
++#if defined OIIO_VERSION && (OIIO_VERSION<10100)
+ namespace OIIO = OIIO_NAMESPACE;
++#endif
+
+ GLint g_win = 0;
+ int g_winWidth = 0;
+--- src/apps/ociolutimage/main.cpp
++++ src/apps/ociolutimage/main.cpp
+@@ -32,7 +32,9 @@
+
+ #include <OpenImageIO/imageio.h>
+ #include <OpenImageIO/typedesc.h>
++#if defined OIIO_VERSION && (OIIO_VERSION<10100)
+ namespace OIIO = OIIO_NAMESPACE;
++#endif
+
+ #include "argparse.h"
+