summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-03-10 13:17:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-03-10 13:17:51 +0000
commitc79359e08a4afb794dc8ec42b99faaecd62245dd (patch)
tree074cbc591387a2bd421356a91999329995fa5672 /media-libs
parentUSE opencolorio was renamed to USE colorio (diff)
downloadgentoo-2-c79359e08a4afb794dc8ec42b99faaecd62245dd.tar.gz
gentoo-2-c79359e08a4afb794dc8ec42b99faaecd62245dd.tar.bz2
gentoo-2-c79359e08a4afb794dc8ec42b99faaecd62245dd.zip
Enable default, and rename USE opencolorio with USE colorio to match media-gfx/blender.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/openimageio/ChangeLog7
-rw-r--r--media-libs/openimageio/metadata.xml2
-rw-r--r--media-libs/openimageio/openimageio-1.1.1.ebuild8
-rw-r--r--media-libs/openimageio/openimageio-1.1.3.ebuild8
4 files changed, 15 insertions, 10 deletions
diff --git a/media-libs/openimageio/ChangeLog b/media-libs/openimageio/ChangeLog
index 6e216578597b..5165c7fc8dbd 100644
--- a/media-libs/openimageio/ChangeLog
+++ b/media-libs/openimageio/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/openimageio
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.18 2013/03/02 21:46:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.19 2013/03/10 13:17:51 ssuominen Exp $
+
+ 10 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> openimageio-1.1.1.ebuild,
+ openimageio-1.1.3.ebuild, metadata.xml:
+ Enable default, and rename USE opencolorio with USE colorio to match
+ media-gfx/blender.
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> openimageio-1.1.1.ebuild,
openimageio-1.1.3.ebuild:
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 9b93d3fe838f..d2f168304246 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<herd>graphics</herd>
<use>
- <flag name='opencolorio'>Use <pkg>media-gfx/opencolorio</pkg></flag>
+ <flag name='colorio'>Use <pkg>media-gfx/opencolorio</pkg></flag>
<flag name='opencv'>Use <pkg>media-libs/opencv</pkg></flag>
<flag name='tbb'>Use <pkg>dev-cpp/tbb</pkg></flag>
</use>
diff --git a/media-libs/openimageio/openimageio-1.1.1.ebuild b/media-libs/openimageio/openimageio-1.1.1.ebuild
index f0b4122df6f5..48f9fddff608 100644
--- a/media-libs/openimageio/openimageio-1.1.1.ebuild
+++ b/media-libs/openimageio/openimageio-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.8 2013/03/02 21:46:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.1.ebuild,v 1.9 2013/03/10 13:17:50 ssuominen Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://github.com/OpenImageIO/oiio/tarball/Release-${PV} -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~ppc64 x86"
-IUSE="jpeg2k opencolorio opencv opengl python qt4 tbb +truetype"
+IUSE="jpeg2k +colorio opencv opengl python qt4 tbb +truetype"
RESTRICT="test" #431412
@@ -31,7 +31,7 @@ RDEPEND="dev-libs/boost[python?]
sys-libs/zlib
virtual/jpeg
jpeg2k? ( >=media-libs/openjpeg-1.5 )
- opencolorio? ( >=media-libs/opencolorio-1.0.7 )
+ colorio? ( >=media-libs/opencolorio-1.0.7 )
opencv? ( >=media-libs/opencv-2.3 )
opengl? (
virtual/glu
@@ -76,7 +76,7 @@ src_configure() {
-DUSE_EXTERNAL_PUGIXML=ON
-DUSE_FIELD3D=OFF # missing in Portage
$(cmake-utils_use_use truetype freetype)
- $(cmake-utils_use_use opencolorio OCIO)
+ $(cmake-utils_use_use colorio OCIO)
$(cmake-utils_use_use opencv)
$(cmake-utils_use_use opengl)
$(cmake-utils_use_use jpeg2k OPENJPEG)
diff --git a/media-libs/openimageio/openimageio-1.1.3.ebuild b/media-libs/openimageio/openimageio-1.1.3.ebuild
index cfc5cecba146..3277e3ca54ac 100644
--- a/media-libs/openimageio/openimageio-1.1.3.ebuild
+++ b/media-libs/openimageio/openimageio-1.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.3.ebuild,v 1.3 2013/03/02 21:46:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.1.3.ebuild,v 1.4 2013/03/10 13:17:51 ssuominen Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="jpeg2k opencolorio opencv opengl python qt4 tbb +truetype"
+IUSE="jpeg2k +colorio opencv opengl python qt4 tbb +truetype"
RESTRICT="test" #431412
@@ -31,7 +31,7 @@ RDEPEND="dev-libs/boost[python?]
sys-libs/zlib
virtual/jpeg
jpeg2k? ( >=media-libs/openjpeg-1.5 )
- opencolorio? ( >=media-libs/opencolorio-1.0.7 )
+ colorio? ( >=media-libs/opencolorio-1.0.7 )
opencv? ( >=media-libs/opencv-2.3 )
opengl? (
virtual/glu
@@ -76,7 +76,7 @@ src_configure() {
-DUSE_EXTERNAL_PUGIXML=ON
-DUSE_FIELD3D=OFF # missing in Portage
$(cmake-utils_use_use truetype freetype)
- $(cmake-utils_use_use opencolorio OCIO)
+ $(cmake-utils_use_use colorio OCIO)
$(cmake-utils_use_use opencv)
$(cmake-utils_use_use opengl)
$(cmake-utils_use_use jpeg2k OPENJPEG)