diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-12-15 19:10:58 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-12-15 19:10:58 +0000 |
| commit | 462175a138097abfc5b035bd7bd7eca4c72a9cde (patch) | |
| tree | 3b5c5dfe351c8e47efed94fa5f461d4fad952bd9 /media-libs | |
| parent | Mask pgo useflag on www-client/firefox until it can be properly supported (diff) | |
| download | gentoo-2-462175a138097abfc5b035bd7bd7eca4c72a9cde.tar.gz gentoo-2-462175a138097abfc5b035bd7bd7eca4c72a9cde.tar.bz2 gentoo-2-462175a138097abfc5b035bd7bd7eca4c72a9cde.zip | |
Fix building with x86 (32bit) by reordering internal headers wrt #444784 by "jazzed.jazzed". Patch is from install_deps.sh used when building Blender by hand.
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/openimageio/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch | 15 | ||||
| -rw-r--r-- | media-libs/openimageio/openimageio-1.1.1.ebuild | 6 |
3 files changed, 26 insertions, 3 deletions
diff --git a/media-libs/openimageio/ChangeLog b/media-libs/openimageio/ChangeLog index 05a5ae3980b1..c965ef49bbe4 100644 --- a/media-libs/openimageio/ChangeLog +++ b/media-libs/openimageio/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/openimageio # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.13 2012/11/26 11:21:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.14 2012/12/15 19:10:57 ssuominen Exp $ + + 15 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> openimageio-1.1.1.ebuild, + +files/openimageio-1.1.1-x86-build.patch: + Fix building with x86 (32bit) by reordering internal headers wrt #444784 by + "jazzed.jazzed". Patch is from install_deps.sh used when building Blender by + hand. 26 Nov 2012; Agostino Sarubbo <ago@gentoo.org> openimageio-1.1.1.ebuild: Stable for amd64, wrt bug #436572 diff --git a/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch b/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch new file mode 100644 index 000000000000..59821660cc8e --- /dev/null +++ b/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/444784 + +--- src/libutil/SHA1.cpp ++++ src/libutil/SHA1.cpp +@@ -8,9 +8,9 @@ + + // If compiling with MFC, you might want to add #include "StdAfx.h" + ++#include "SHA1.h" + #include "hash.h" + #include "dassert.h" +-#include "SHA1.h" + + #ifdef SHA1_UTILITY_FUNCTIONS + #define SHA1_MAX_FILE_BUFFER 8000 diff --git a/media-libs/openimageio/openimageio-1.1.1.ebuild b/media-libs/openimageio/openimageio-1.1.1.ebuild index 52ddc2b52e80..86b41e485442 100644 --- a/media-libs/openimageio/openimageio-1.1.1.ebuild +++ b/media-libs/openimageio/openimageio-1.1.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.1.ebuild,v 1.4 2012/11/26 11:21:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.1.ebuild,v 1.5 2012/12/15 19:10:57 ssuominen Exp $ EAPI=5 PYTHON_DEPEND="python? 2:2.7" -inherit cmake-utils multilib python vcs-snapshot +inherit cmake-utils eutils multilib python vcs-snapshot DESCRIPTION="A library for reading and writing images" HOMEPAGE="http://sites.google.com/site/openimageio/ http://github.com/OpenImageIO" @@ -56,6 +56,8 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-x86-build.patch #444784 + # remove bundled code to make it build # https://github.com/OpenImageIO/oiio/issues/403 rm */pugixml* || die |