diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-12-15 19:11:04 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-12-15 19:11:04 +0000 |
| commit | a7a9e2461aa630c271182a95d125e3c058304f89 (patch) | |
| tree | 91767f94549897755a2a7396e4c3f3641dece101 /media-libs/openimageio | |
| parent | Mask pgo useflag on www-client/firefox until it can be properly supported (diff) | |
| download | historical-a7a9e2461aa630c271182a95d125e3c058304f89.tar.gz historical-a7a9e2461aa630c271182a95d125e3c058304f89.tar.bz2 historical-a7a9e2461aa630c271182a95d125e3c058304f89.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.
Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'media-libs/openimageio')
| -rw-r--r-- | media-libs/openimageio/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/openimageio/Manifest | 19 | ||||
| -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 |
4 files changed, 43 insertions, 5 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/Manifest b/media-libs/openimageio/Manifest index 17892eaef8f7..1a74ced6af83 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,4 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX openimageio-1.1.1-x86-build.patch 317 SHA256 e1eef902ac86f8b7dba660cfc6ed87b33fa863addb47c70a5e491882116e833a SHA512 5c3e01abbe949a9a2e89db4f0cdeb5cfa71bcd362461654f1c59b75f952ed9e7d183cc9c66537eccef6bdb88e4d6ddd0ff8994ad4cecce9f0ca370a3726c8b72 WHIRLPOOL 6c3950b8cd89849f4162643be4a535b4a96b6cc53935bad919b4d83618f327f1510c56b9ed4f3b7aea12179bac796f6a61d5f64368aa06fcb3827266bda469e6 DIST openimageio-1.1.1.tar.gz 8217144 SHA256 a1cf6251edb597d31ccec3a74f516c3c9ce6e116dfb5edb3e4bd87d528d4700d SHA512 cf3e1371c6f0333f40506b08dc3fa6c0acecfb149e2e99159e893825e0d838db8ac1150e316e3568024568ed19bbcb473b4f38a61779a03fe9706ee476ec5943 WHIRLPOOL 78420497e1b65140f439e67c295102de5def4ed92eac1bf7b3b417d79d4634a0b149d08eafb8127aa1c5f1eb770334a14b244bee1f7af61ef31dc2abb2309aae -EBUILD openimageio-1.1.1.ebuild 2367 SHA256 acf05db6901418825e9ee10ff120e9598af2eeab31ddc91e9c84f0268d43a270 SHA512 c1dde094b8ed74ce8f45bb473afbb6d1eefa8e1bc555e042e85fabb47798478ebb8c0422c2adc156cd1214eb0bb213c6f8cbc1521e87247bf6ad45848e5eb06b WHIRLPOOL b6c3dc15baf857e535ae9ae807400e6040bb1ea50ca0e03750970fa9d0aba2ee370d1877372f8f6814f8e44d7151cddc8d3f679075a0c9ad25bc14ed54087fa3 -MISC ChangeLog 2623 SHA256 2c64b0c4da3cd68e1677aa67036f2836b83bd95825316ac596a84156ab7f27bd SHA512 30bed0d28532124ecf572d81dde7fdbd69b31edc2fe87b4b9e7a5cb6d3aaa5499b9164dc815fa85004cde01ce6b0a31cebfa60c797de665ffa01fea397fa4fa4 WHIRLPOOL 4116e1a2b43e0704c85526cc8dfece512fc637f03bf81dc179c888a6f48db43e8cd704af192a1e3b00b8514ae1802a194cc1517b93f0517b9c23b8a1718865b8 +EBUILD openimageio-1.1.1.ebuild 2432 SHA256 ea48ecf608ddfb5baa257f516ae400f081c23669d8aeecd3a189264bf53cc64c SHA512 7bb5bc2c9032072fbcc729eb36f3b91d33acb04d88aa0526e23e4958af8583bdce64a4b0115e343dc70d0537bc87859daff9677ea5ce233b7914e1c3e7dc0ed3 WHIRLPOOL 775f94c354d5b6419107c6d24b8dcdc92d9fa5231234cde7c0f4c4fce88cd6c24183220dc48ef019514a706d29d80e3abee180d809f9ca95668b977f4cbbb5c6 +MISC ChangeLog 2919 SHA256 dd7d803310132702c3fac56c16b17f7e2d886abfe0c6b1d9a403aa4ce6a6a5a2 SHA512 43127f2e22396e2fda06b72518a8a76a0aa6237d839d54574f019570d16a3e4b3efd529bbcd149b105288b889e349ad1b629f310aebeeb919c5a8db19666c7c4 WHIRLPOOL 193f4e57f2dbf525fd55598de21caecd4073fe093408724f32477094fa88908a438a22ee55310567826a3c795df7ccec6bdb50a9b1112d350ee2753947106ee1 MISC metadata.xml 363 SHA256 8c4330462c57097f48a9acf8ac92f4624719e9b15a6aab0456541556812ac2cd SHA512 f8eebd69532fa3d75aa2fdb754c0f5a23a13d46b71853f3493bd9c6a86145c368b78a18c16d27f243e6c21b04c75acba57108fad8cb8cad7f2949730f7cd7364 WHIRLPOOL 756c3ea39c45b2c099e98d3af21d4eaaf87889950e9cb37b5f426416f39b5f979b0bec66c1ca3d5b8776dda36781a2388bfc97b895792f215bb8c47a93e0ed5f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQzMtDAAoJEEdUh39IaPFN3lwH/21tmex3w1kKv6Q9wGNOuJz7 +fgyDU8p9LDuqbucL7hNIxeMm8yf2outPI4773Q4/Ep38NPK5Ef5VafI79N7SaC+N +HNaBgCPcmXznc8GLJMf/2inZLfl2KUmhFvBniK8PRgKJKzKqigSlF4AtDhbvJieY +VBmoJJmqBfFgBaj6vv8LAawqNf5LkpaABHHq0NgXM+JyG4hznjhaszH4AT03P6rT +k8l2+ZFUAmyYwq6WdyIBAx19EKYwNTz+wv+TYdAAifmOGjzfmwMXZ6+a9OySMF6m +GbetS0QxoNnval13MJs0YaSAtVyBWPysEAT88KCiFrKSmxJfjcWmLBAP3J0v4Do= +=J+sH +-----END PGP SIGNATURE----- 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 |