diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-11-24 21:40:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-11-24 21:40:45 +0000 |
| commit | bb946706fc7ecf00d1b5e9b2d1a1d4b9f731c092 (patch) | |
| tree | b35a0baac6a77af9ded699b667b8a08ffc2fe898 /media-gfx | |
| parent | Mask/unmask python_single_target use-expand values. (diff) | |
| download | historical-bb946706fc7ecf00d1b5e9b2d1a1d4b9f731c092.tar.gz historical-bb946706fc7ecf00d1b5e9b2d1a1d4b9f731c092.tar.bz2 historical-bb946706fc7ecf00d1b5e9b2d1a1d4b9f731c092.zip | |
Fix building with current openimageio
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/opencolorio/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/opencolorio/Manifest | 19 | ||||
| -rw-r--r-- | media-gfx/opencolorio/files/opencolorio-openimageio.patch | 38 | ||||
| -rw-r--r-- | media-gfx/opencolorio/opencolorio-1.0.7.ebuild | 10 |
4 files changed, 66 insertions, 7 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/Manifest b/media-gfx/opencolorio/Manifest index 1e86768a2e13..ac6c7eb9981b 100644 --- a/media-gfx/opencolorio/Manifest +++ b/media-gfx/opencolorio/Manifest @@ -1,6 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX opencolorio-documentation-gen.patch 4479 SHA256 887ae8dfdb06026c6836253c322725c7042eb14fbef5c0e601bb1b1ef8c43b62 SHA512 4bf0227de03095cb822d89ef449c69df45ab8104ce6becfe8aeb45597fd05980e1910acd2023bf9468d61adeea2d5ec410afbf24cf8f947c0dcd9bf46bea6f24 WHIRLPOOL cb85017075aadd96315474838cb93f3cd7573912c668dee1cec0291209ed039cda687954104e12c0e70438f799d1c0b99bd652e495fc6684a49f48be1140ac07 +AUX opencolorio-openimageio.patch 931 SHA256 e7e41dcd784510c3d036474f33b8a4a8bcaf915b8571f50aa8d67d6accb2c633 SHA512 d3547b7a9f7699914cddb9f2493c1e97d69d0b1fbfe04295286dfec5815425ad1666cede9782176f12a1d56ff6ce502d493abd00d09def7e964ef03478449f30 WHIRLPOOL e7fbf82e3febaa5ce29a8da123a5211849f6eb6a7b2660f5a94e0dea6189a5ebd4d6a4c9d146012fe9f12cbbfb5aa12c7cf8f6b2afab792fbedfb5d969f7897b AUX opencolorio-use-system-libs.patch 984 SHA256 423f24c9d913e052cbcb863dcda9d9eb6166473a6ba133d04692b1bd8149a721 SHA512 8c98d02ebb29c8e085f96dbe59c79ae2bb57de19b73c3b06f6e374181e2bca624d20ad0a5d386cbc68e3f81e7427f43c0867ed7c74e86916d47f9c0fa63c4513 WHIRLPOOL 7a3bb0099347e048d324dfe19099dbc6184405a45d5d98ad3434546f58f6ccb32eabebb9fd7c7bfdb352c8b55d058e8051627326bb96d1f42034cfa547d1b4be DIST opencolorio-1.0.7.tar.gz 11844185 SHA256 54c6516a89dc9287f1bcc47f27a91fb608477295a4ba6106b45f34e89506d7d5 SHA512 34a9a92aa0cabb449e14fbca32ece1ba411b8d8154cb459e5a88d63bd0b43ffd9b6eeda324339cbd0e8f51b086a34235a984030647b766342c41dc1ec633a70a WHIRLPOOL 6701f1446c1540e2400982f1cd1961803c9e9bde50bd34bff46fd819366d1226defa0334fe1610d3b3ee4d30a04530bdecad89363fd480ea025391382b0e4537 -EBUILD opencolorio-1.0.7.ebuild 1956 SHA256 ef15e75810f11b9999ab3c31c7c95e0b5da4fe665171e61b196631c95f519e82 SHA512 6b262e9364574aca1b350dc72d48da4f73e4ad7e90e1f19975faf90301cbd1f91a6b1c494b67df05682c283625d7892e419492b3e98fcccf6f6e72573382ba88 WHIRLPOOL 6f3f3a1855fb4cd15fc5c039aededeb936a1ceb866abf926e7ec25792fefdc5cb42f4fa43ef515d07ab3aa9a02821e1374d64f15d39ba658f967e421313af95e -MISC ChangeLog 466 SHA256 4434afeda72dfd014ac116de8ca51a0f0d326926a8730e32cf316e685c780977 SHA512 7c8d0ee51ac374fbad16d036c67532523a9c72430e03948adb83ea247cd85eda4f637f4ddc954b2ed6149cc63eb00ec1e599c4d52305537b87a00580f061bc6c WHIRLPOOL e12e19750a3bf8c6606368b38411d4bafee6ad7364ff698506ce3251997b76dd4ee66ae999586a0820d57f5d03ab97965dc07d098abec09bfd14e3a9b44dbbf3 +EBUILD opencolorio-1.0.7.ebuild 2003 SHA256 00caf8b2188ca6b170c8b86d3f53641e16dc300e479ade1f93e894b30f045fac SHA512 d8af3002ccaafe6b84f147d362327dfb96373d7a9d4faefdd63591674b8eba41038c08ee4d95d8ddefd19700b6aa5beccfcbcef2d00b4ffce3939de2ae166612 WHIRLPOOL 2f8f93cbe84541025a7764cdb0d146642dfa5510963524044548ae9cae8cf93dae17f9fd559ee682f247b5f1a71f4407761afd0ccb19cf1c50d2867b0ee1f8fd +MISC ChangeLog 640 SHA256 8f2c345e7a86e0456ec3f4d00fa1a2184196e5580fe04178ae8a35a5a9284055 SHA512 1abbde463db7d090ac26da6a22ec1f36b075c066a91090916af2262a6e6cb41c2219afc6f5955e542914f87200750a95e0cfbe9ecce24b9245d0bc05c31748ae WHIRLPOOL 15f7091e7dc722ecde9cb897aee8709fa63cb594eec35c2a9ad9253cd8ddc7ef8a364ce2ad2d6f6323de21539922d4a51839fc05693422b0b10ac412756259ca MISC metadata.xml 438 SHA256 4e3bd3147d7af2d93cfae292dfb96451ba39e9a36fd110ff630f66c9cf065ec5 SHA512 cb8ae7cf634e17b800cf9992bd210d9d4f97a3449f4073aae4b9662536e575971836e50feed65975554a17ed08a65c620392511dec7d032d7c6883e1435fcf19 WHIRLPOOL c761ae14a8caece0bb6ccf0158dff6e65ee50f5b567a7ddb914d051cca4fea1e7b9173b7dc69002806f033e4c2168ef0f47a2a09880111d970faf227c4929eee +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQsT61AAoJEEdUh39IaPFNnucIAI5nRrhLN4T7/B4z4zId367l +CZAMvCdgZ0OB99XejMylup83hl2+4iK9jNCSL5HcUEEk8VlI0F0E7N7xFwLp75U8 +F9cd7V39h8zYTJLK/esdAF33shwBid6fSE0GV3s9fm7cwjTHOj7GuGPXkNKINS06 +Wg482h3LafQNLxcSbO/HvpFn42r2uPgJLyjf1nwePf2kQ5sqllG7mLvQS3pLD8ZJ +v9/ImH0hiQC/5tRDPBZQc7gstuiq/9xL08OfGGBPoeK42srBicnG/4VU9oIhjcbg +ol70lAT6dVzhcN2UDzOij3KiTP+x8U1O1RnGv0Djhc2EHuwIXTcyJDks6+9vUb8= +=9Ftu +-----END PGP SIGNATURE----- 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() { |