diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-11-24 21:40:40 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-11-24 21:40:40 +0000 |
| commit | 1c4636695eef35ed8530c0f8ad8f3d593970772f (patch) | |
| tree | 031d6e47a4f54b4debdf9b008a8f9347243fb298 /media-gfx | |
| parent | Mask/unmask python_single_target use-expand values. (diff) | |
| download | gentoo-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')
| -rw-r--r-- | media-gfx/opencolorio/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/opencolorio/files/opencolorio-openimageio.patch | 38 | ||||
| -rw-r--r-- | media-gfx/opencolorio/opencolorio-1.0.7.ebuild | 10 |
3 files changed, 49 insertions, 5 deletions
diff --git a/media-gfx/opencolorio/ChangeLog b/media-gfx/opencolorio/ChangeLog index ce64982ba161..002dcb6fe4f3 100644 --- a/media-gfx/opencolorio/ChangeLog +++ b/media-gfx/opencolorio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/opencolorio # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/ChangeLog,v 1.1 2012/09/03 08:32:34 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/ChangeLog,v 1.2 2012/11/24 21:40:40 ssuominen Exp $ + + 24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> opencolorio-1.0.7.ebuild, + +files/opencolorio-openimageio.patch: + Fix building with media-libs/openimageio >= 1.1.0 *opencolorio-1.0.7 (03 Sep 2012) 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" + diff --git a/media-gfx/opencolorio/opencolorio-1.0.7.ebuild b/media-gfx/opencolorio/opencolorio-1.0.7.ebuild index 2a0d07f33c17..a3d559fd8b28 100644 --- a/media-gfx/opencolorio/opencolorio-1.0.7.ebuild +++ b/media-gfx/opencolorio/opencolorio-1.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/opencolorio-1.0.7.ebuild,v 1.1 2012/09/03 08:32:34 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/opencolorio-1.0.7.ebuild,v 1.2 2012/11/24 21:40:40 ssuominen Exp $ EAPI=4 @@ -20,7 +20,7 @@ IUSE="doc opengl python sse2 test" RDEPEND="opengl? ( media-libs/lcms:2 - media-libs/openimageio + >=media-libs/openimageio-1.1.0 media-libs/glew media-libs/freeglut virtual/opengl @@ -43,8 +43,10 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/"${PN}"-use-system-libs.patch - epatch "${FILESDIR}"/"${PN}"-documentation-gen.patch + epatch \ + "${FILESDIR}"/${PN}-use-system-libs.patch \ + "${FILESDIR}"/${PN}-documentation-gen.patch \ + "${FILESDIR}"/${PN}-openimageio.patch } src_configure() { |