Version bump; the new version builds with GCC 4.7 (closes bug #424061) and with Boost 1.50 (thanks to Philipp Middendorf in bug #424353). Also introduce USE flags for new and old dependencies.

Package-Manager: portage-2.2.0_alpha117/cvs/Linux x86_64

5 files changed, 150 insertions, 20 deletions

diff --git a/media-libs/openimageio/ChangeLog b/media-libs/openimageio/ChangeLog
index 8ef28e9c32dc..a665e38cb0a9 100644
--- a/media-libs/openimageio/ChangeLog
+++ b/media-libs/openimageio/ChangeLog
@@ -1,6 +1,15 @@
 # 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.2 2012/02/22 18:47:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.3 2012/07/15 21:00:03 flameeyes Exp $
+
+*openimageio-1.0.7 (15 Jul 2012)
+
+  15 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/openimageio-0.10.5+boost-1.50.patch, +openimageio-1.0.7.ebuild,
+  metadata.xml:
+  Version bump; the new version builds with GCC 4.7 (closes bug #424061) and
+  with Boost 1.50 (thanks to Philipp Middendorf in bug #424353). Also introduce
+  USE flags for new and old dependencies.
 
 *openimageio-0.10.5 (22 Feb 2012)
 
@@ -14,4 +23,3 @@
   +openimageio-0.10.2.ebuild, +files/openimageio-0.10.2-libpng15.patch,
   +files/openimageio-0.10.2-multilib.patch:
   Initial commit wrt #377853 by "Shannon"
-
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 0dfd3194a0e8..40840bb1c93f 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX openimageio-0.10.2-libpng15.patch 221 RMD160 9c360aa5826ec8e9cc199b371864b2bf5d964dd2 SHA1 1024eaca857133a969a01b64595b11917cca1176 SHA256 b0ee405f8ec5e1654b3c7441f0e4e3555491d23fb139769a30ed555a84be9b1b
-AUX openimageio-0.10.2-multilib.patch 536 RMD160 2a4a4bfae236f7df9247ca5c6bb1a70f47cb444a SHA1 16ab642c922a7a46e255b5d962444cdbe51871f7 SHA256 eb0318a5eb7c8dade6f5982b60de09a1153d52cc8bb28415d8d6dd0973fb6a0e
-DIST openimageio-0.10.2.tar.gz 3534111 RMD160 0b4c6bad1c9c7ba6cb7b9647f7c446f7337a4d1e SHA1 fce46f0b536caf1e67d503a6277b2a6420856d69 SHA256 ce2ab5de557dc4bb3f1991a3bf39791d985468db561d600bd26db5b6d3711517
-DIST openimageio-0.10.5.tar.gz 3537727 RMD160 fffcf5ffa58a113d1c0af6b678044507adde8009 SHA1 7a741f9ccade25298503442c5f716cdc788ad507 SHA256 1bae0ce0c41c6b262787ca9ef9c5a76dc2b929abe39172ed53851dc05a284e67
-EBUILD openimageio-0.10.2.ebuild 1444 RMD160 cd7eda6e75ff063dd262538f59dce86d6f1d0ea2 SHA1 90d23499175b2486d034465254fab4018ae3fe5c SHA256 524bfdf2622e9182bae52aded4e0249de18d1db31a11918d710a4461797d81db
-EBUILD openimageio-0.10.5.ebuild 1460 RMD160 460ca6b6cf254a909c474e9ad026d1d54d0d02b5 SHA1 ae5031b3d0e96f27b63d785c0e6e44ff546fdf5f SHA256 3c30870b7eb15249ddf229f7dda966136d028a505a98c7574fcadd3efae3ebf2
-MISC ChangeLog 604 RMD160 8e449fa997af5b76d14ba267d716aaa2ffcd7b65 SHA1 d9eac97e98fd5641a8cdeb2dc9acb50aabbe24d0 SHA256 74adb3d359ba5801a1edd7e722fc014436dfe42c8f299d1ec7cefb6de48beb3b
-MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+AUX openimageio-0.10.2-libpng15.patch 221 SHA256 b0ee405f8ec5e1654b3c7441f0e4e3555491d23fb139769a30ed555a84be9b1b SHA512 5ba312708c351e2f033f27ffc1616905653f4a74f433d595d15b72fb2c22dde588fbbdcc75fb4b9303603eb5f9e116c47d0f7bf2958dcafa06364a98d24df2db WHIRLPOOL f1de29a398087ff0ffd07ae8e7bc5a42a5f0ba111a7f38e20313f7df20692849550fb184638dea8f8ade4aee4f29b73f7c900f3c12041bf18f2247274d482821
+AUX openimageio-0.10.2-multilib.patch 536 SHA256 eb0318a5eb7c8dade6f5982b60de09a1153d52cc8bb28415d8d6dd0973fb6a0e SHA512 f5afb63160763ebb716d3c35fdc4053d3b12de33e6efaf8f549617953c63ca37f104b5bc5945cd25f5c1c80d78e1c24323012160e9197797ffc1a25b9851c37c WHIRLPOOL 7e3a6d721ff248e05989aaf40f488a9e6e4fa8d61a9a0c9406bb44cbaff72451d2b98e2a951126dad84a91cf94adc6d1158a0b085c3752ec23f964eb74acfbe3
+AUX openimageio-0.10.5+boost-1.50.patch 741 SHA256 1b9c64450f2e950da71a6d55d7d597f97d756e7fe196764b49f95a84d7776048 SHA512 eb28b8a18e4ae75a971e4afff66913c25282664440b060789a3b082807c5be1998f30ea886297654feafa44ca3da93647bff34e9159eed7ddc490c7a18c87eb4 WHIRLPOOL 78619f9d5de55de1b19b2d1b06e4e4e0648eeea140001fa2014e40e3a94498de37cbbe006ad8a8334359a37e0d43a9faf31c61dfed7de14e640721e63402c8d4
+DIST openimageio-0.10.2.tar.gz 3534111 SHA256 ce2ab5de557dc4bb3f1991a3bf39791d985468db561d600bd26db5b6d3711517
+DIST openimageio-0.10.5.tar.gz 3537727 SHA256 1bae0ce0c41c6b262787ca9ef9c5a76dc2b929abe39172ed53851dc05a284e67 SHA512 dbd73e0aa53e80d81ff90d8cd447723bb38b96c6c3f3a29d356b82c51f81fc62607269567066d2f55893f5aeeeb00da60ac19440630c792a2676d40d606487b1 WHIRLPOOL f5e7153fcbc722d911c992a9959345fd1c6e957a44901cec61f0d7db3d00ab54479b8a6ae3cc6f6c2beb9c5d86bfdf7496525c26926b5315facd56d5ab3ce742
+DIST openimageio-1.0.7.tar.gz 4197210 SHA256 14d3ffa175ff584c22cbf0ded70630587b884aa6ad2d02c06885d2fbf1e6915f SHA512 21dbe411ea0c0e45845fbfd3a1ca4915f95b875a1710cc8fde9c4f1c9b96a7d83431b5dfbbfa320e5c92ddc516657cd62281903365880f3417a7b27c123cbf48 WHIRLPOOL f6e4bd0cc7f322a0adee0c50debf5616f14d2ee6229597c83bc244635ebace0821e89b93ed0edfc5fb4b4d7f5164eeba279f57e68b6bdce6417ee9e2af92aaa2
+EBUILD openimageio-0.10.2.ebuild 1444 SHA256 524bfdf2622e9182bae52aded4e0249de18d1db31a11918d710a4461797d81db SHA512 d31e0b280b79754b8b1f2d937d79052a1b2092a83bcbbbf04e6cff22468a21b048add34425b449720f3592e9ba790da56554d016f4c66c906cb1ea0c68d3afbd WHIRLPOOL 358349daf1b4f590c344346b780fc8140ab516f9988cac737c7fe4edd3759a871f2bffd1d1e4bec90a1fce64fd472c23b7acdb087891540db9471168a0b42244
+EBUILD openimageio-0.10.5.ebuild 1460 SHA256 3c30870b7eb15249ddf229f7dda966136d028a505a98c7574fcadd3efae3ebf2 SHA512 56157c6137437b61ff87b2ff12c017699623c45cfbb29cc7e0375cb71ce502d549c18ec95130b9ba495f9925360ce0a5512a9f6738e115773e0b7726f96c8d0a WHIRLPOOL 48503b1da9d3ee4a582999eb85ce02d72ff92aa0dbc2a543ccc710a8ff9929d690fc359bf46fae07cbd22baeed4e8ab8dcfb2313faa72164ad8eb6dde1dee6ce
+EBUILD openimageio-1.0.7.ebuild 2237 SHA256 13d5ec0b4103a8429782b1d3ad36ad115bf0ad3c10246ce0b80aa7e36a0c547c SHA512 0cf6cdccc0fff6aeb71de54f2dfdef59fb6496c80e7e5376cb347c51369d08c53c8b8a0215a16cf6e9d5d0fcbf69ff2c651956c8ad22814b67d5cd432aecae99 WHIRLPOOL 2183b6ed059a8d5855ad13248aa77a32222459aa5fe224b6509c4ff646c00b26bd150a1761976945b763343e0840cdd7cd354698ed9b576e5b4ae92cb9b31b4c
+MISC ChangeLog 982 SHA256 b1b874caab548c33d9c253bb54ad3b919270b3a077302a966e7eee1ad4d3fde8 SHA512 342a78786d35cd58ec068f08a37a94c3186c57623e358b56d9283f593d03ad4b53fe80c29d144789c7e4ad54c329b85a2f01755d50517afcb710602fc8c001d9 WHIRLPOOL 8b43205cb705f83d43ad4c66970d5946effb4d4f35041868cca098f7d0573837a6705d54cf58c13e716bebf69dfe640538eccb146575a1c856dc410df1ba3039
+MISC metadata.xml 369 SHA256 112b0372f79487bde234c1c7765d6fbf0dec923fd639dabd79e3973d42348756 SHA512 4db0edf64aaef2da8392ab4baa91cd3add3e9249b4fb849b64d82e19649054691d8703b2d30099812341e4d848104d2f27f3edb557fe23de3fce51b4999e26dc WHIRLPOOL d981bb7d154c783fcae04bb64149f32edb11503f5e764b2c3713738850830fddbceb1fa023a38f6e8676efda1405f4cea2aa1eb1d461087cbcd18c4946025218
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPRThHAAoJEEdUh39IaPFNx6kIAKEMg/JeuFbi/6tFYzBUMW5e
-a3JM5GUy+LLDrNQ4ND7cmff81A+gecIyXMamMph0OUwiusJcWi12P6gp3apIyPhD
-dJTcwXkuXQ91YCEvs6xVZT2GXWNT0LJLVFOW0rS/aRu4oHgNXJDeR2DJxna2Yder
-XBcsd+YRP2lFg3rVVMGJCfKiL3deKgjCvD0zKBn6BZCfbSU9i35n9416WmR7FCce
-6KeW3SBXEg2EgGVQGQPJfNhXlQZF1/PbYQqHOHtGm8TGfj/AdLBkosLjbi9LoN+G
-gybdeXDD9HH9eiBaiZIoEckFNPa1hzTd6VWuWzp5WX3OxkJTL/7VzMnkM8M1pgM=
-=R2cv
+iQEcBAEBCAAGBQJQAzAKAAoJEBzRPIrUMBNCxiAIAJhPOmg0ll2GHqrAnFwVjwVT
+p7MPM19jnuu1KAJQ/ppszfsr4sh6o1PkXo+oaZdVGG1K6CqPktTCMLFqwgv/kXo3
+ybeBiYwRha2uOlnPkRprBieUouvBE9kQ8P74PZrrvIPScRfde5JCAaGraYAV+6yv
+teuJHt25JenF5am3OIe+DKOJbyxc6kMTq+NK0Klwlp70/J5Y466yIbJXEfvYJdnb
+dfL7z2/rBvw+9e/SHOin/KHC5qCiiBH19jbQE9YNsHG78L9K7H36sQOu03xsGKQ4
+2fPGeUGl1mozhwoLp+TlDpA0SXppp1iR7pKQOnsRbCvrxo8OJqMgQ0BwiBkRNvg=
+=tZQQ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openimageio/files/openimageio-0.10.5+boost-1.50.patch b/media-libs/openimageio/files/openimageio-0.10.5+boost-1.50.patch
new file mode 100644
index 000000000000..94ae0ddc8784
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-0.10.5+boost-1.50.patch
@@ -0,0 +1,13 @@
+--- src/iv/imageviewer.cpp.old	2012-07-01 12:17:57.138829803 +0200
++++ src/iv/imageviewer.cpp	2012-07-01 12:21:31.543823577 +0200
+@@ -1352,8 +1352,8 @@
+ compName (IvImage *first, IvImage *second)
+ {
+ #if BOOST_FILESYSTEM_VERSION == 3
+-    std::string firstFile = boost::filesystem3::path(first->name()).leaf().string();
+-    std::string secondFile = boost::filesystem3::path(second->name()).leaf().string();
++    std::string firstFile = boost::filesystem::path(first->name()).leaf().string();
++    std::string secondFile = boost::filesystem::path(second->name()).leaf().string();
+ #else
+     std::string firstFile = boost::filesystem::path(first->name()).leaf();
+     std::string secondFile = boost::filesystem::path(second->name()).leaf();
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index e770d1bc9a96..31f8bdb7ccf8 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
+  <herd>graphics</herd>
+  <use>
+    <flag name="tbb">
+      Use <pkg>dev-cpp/tbb</pkg> for threading.
+    </flag>
+
+    <flag name="opencv">
+      Add support for <pkg>media-libs/opencv</pkg> based algorithms.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/media-libs/openimageio/openimageio-1.0.7.ebuild b/media-libs/openimageio/openimageio-1.0.7.ebuild
new file mode 100644
index 000000000000..958484b020e3
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.0.7.ebuild
@@ -0,0 +1,97 @@
+# 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.0.7.ebuild,v 1.1 2012/07/15 21:00:03 flameeyes Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.7"
+
+inherit cmake-utils eutils python multilib
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="http://sites.google.com/site/openimageio/ http://github.com/OpenImageIO"
+SRC_URI="http://github.com/OpenImageIO/oiio/tarball/Release-${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python opengl qt4 tbb jpeg2k opencv"
+
+RDEPEND="dev-libs/boost[python?]
+	media-libs/glew
+	media-libs/ilmbase
+	media-libs/libpng
+	media-libs/openexr
+	media-libs/tiff
+	sci-libs/hdf5
+	sys-libs/zlib
+	virtual/jpeg
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+	)
+	tbb? ( dev-cpp/tbb )
+	jpeg2k? ( media-libs/openjpeg )
+	opencv? ( media-libs/opencv )
+	dev-libs/pugixml"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/src
+
+hpkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	mv OpenImageIO-* "${WORKDIR}"/${P}
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.10.2-libpng15.patch
+
+	# remove bundled code to make it build
+	# https://github.com/OpenImageIO/oiio/issues/403
+	rm */pugixml* || die
+
+	# fix man page building
+	# https://github.com/OpenImageIO/oiio/issues/404
+	use qt || sed -i -e '/cli_tools/s:iv ::' doc/CMakeLists.txt
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		-DBUILDSTATIC=OFF
+		-DLINKSTATIC=OFF
+		$(cmake-utils_use_use opengl)
+		$(cmake-utils_use_use qt)
+		$(cmake-utils_use_use tbb)
+		$(cmake-utils_use_use python)
+		$(use python && echo -DPYLIB_INSTALL_DIR=$(python_get_sitedir))
+		-DUSE_FIELD3D=OFF # missing in Portage
+		$(cmake-utils_use_use jpeg2k OPENJPEG)
+		-DUSE_OCIO=OFF # missing in portage
+		$(cmake-utils_use_use opencv)
+		-DUSE_EXTERNAL_PUGIXML=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc ../{CHANGES,CREDITS,README} doc/CLA-{CORPORATE,INDIVIDUAL}
+
+	insinto /usr/share/doc/${PF}/pdf
+	doins doc/openimageio.pdf
+}