From 855e6bc31372537b6bf3825fba52d31a1d5da661 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 10 Jun 2019 20:11:15 +0200 Subject: [PATCH] */*: USE colorio -> color-management Closes: https://bugs.gentoo.org/613274 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner --- media-gfx/blender/blender-2.79b-r1.ebuild | 6 +++--- media-gfx/blender/metadata.xml | 7 +------ media-libs/openimageio/metadata.xml | 2 +- media-libs/openimageio/openimageio-1.6.13.ebuild | 7 +++---- media-libs/openimageio/openimageio-1.8.17.ebuild | 8 ++++---- profiles/arch/powerpc/ppc64/use.mask | 2 +- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild b/media-gfx/blender/blender-2.79b-r1.ebuild index 9add67424fe1..4e307518c21b 100644 --- a/media-gfx/blender/blender-2.79b-r1.ebuild +++ b/media-gfx/blender/blender-2.79b-r1.ebuild @@ -20,7 +20,7 @@ MY_PV="$(ver_cut 1-2)" SLOT="0" LICENSE="|| ( GPL-2 BL )" KEYWORDS="amd64 ~x86" -IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \ +IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \ cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ osl player sdl sndfile test tiff valgrind" @@ -47,7 +47,7 @@ RDEPEND="${PYTHON_DEPS} virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) - colorio? ( media-libs/opencolorio ) + color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) @@ -180,7 +180,7 @@ src_configure() { -DWITH_MOD_OCEANSIM=$(usex fftw) -DWITH_OPENAL=$(usex openal) -DWITH_OPENCL=$(usex opencl) - -DWITH_OPENCOLORIO=$(usex colorio) + -DWITH_OPENCOLORIO=$(usex color-management) -DWITH_OPENCOLLADA=$(usex collada) -DWITH_OPENIMAGEIO=$(usex openimageio) -DWITH_OPENMP=$(usex openmp) diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index 14a1619c7d4c..6f5b51065dff 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -13,12 +13,10 @@ graphics@gentoo.org Gentoo Graphics Project - Blender, the open source software for 3D modeling, animation, rendering, post-production, interactive creation and playback. - Enable Bullet (Physics Engine). @@ -27,10 +25,7 @@ Add support for Collada interchange format through media-libs/opencollada. - - Enable OpenColorIO color management through - media-libs/opencolorio. - + Enable color management via media-libs/opencolorio. Build cycles renderer with nVidia CUDA support. diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml index 2a9c147e70d3..51a8e3601b05 100644 --- a/media-libs/openimageio/metadata.xml +++ b/media-libs/openimageio/metadata.xml @@ -8,7 +8,7 @@ SIMD Optimization SIMD Optimization - Enable color management via media-libs/opencolorio + Enable color management via media-libs/opencolorio Enable f3d file (write) support via media-libs/Field3D Enable OpenCV support via media-libs/opencv Enable Ptex texture mapping system file support via media-libs/ptex diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild index 80f7135f6bbc..09f2d8e5ed0d 100644 --- a/media-libs/openimageio/openimageio-1.6.13.ebuild +++ b/media-libs/openimageio/openimageio-1.6.13.ebuild @@ -4,7 +4,6 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_5} ) - inherit cmake-utils python-single-r1 vcs-snapshot DESCRIPTION="A library for reading and writing images" @@ -14,7 +13,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~ppc64 x86" -IUSE="colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype" +IUSE="color-management ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="test" #431412 @@ -29,7 +28,7 @@ RDEPEND=" media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 - colorio? ( >=media-libs/opencolorio-1.0.7:= ) + color-management? ( >=media-libs/opencolorio-1.0.7:= ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) @@ -78,7 +77,7 @@ src_configure() { -DUSE_FREETYPE=$(usex truetype) -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_GIF=$(usex gif) - -DUSE_OCIO=$(usex colorio) + -DUSE_OCIO=$(usex color-management) -DUSE_OPENCV=$(usex opencv) -DUSE_OPENGL=$(usex opengl) -DUSE_OPENJPEG=$(usex jpeg2k) diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17.ebuild index f3c032132eb1..4261aca86c63 100644 --- a/media-libs/openimageio/openimageio-1.8.17.ebuild +++ b/media-libs/openimageio/openimageio-1.8.17.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,6}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6}} ) inherit cmake-utils python-single-r1 DESCRIPTION="A library for reading and writing images" @@ -20,7 +20,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) -IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}" +IUSE="color-management doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="test" #431412 @@ -34,7 +34,7 @@ RDEPEND=">=dev-libs/boost-1.62:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 - colorio? ( media-libs/opencolorio:= ) + color-management? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) @@ -98,7 +98,7 @@ src_configure() { -DUSE_LIBRAW=$(usex raw) -DUSE_NUKE=NO # Missing in Gentoo -DUSE_NUKE=OFF - -DUSE_OCIO=$(usex colorio) + -DUSE_OCIO=$(usex color-management) -DUSE_OPENCV=$(usex opencv) -DUSE_OPENGL=$(usex opengl) -DUSE_OPENJPEG=$(usex jpeg2k) diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask index b047e41efe76..3490fa2ef497 100644 --- a/profiles/arch/powerpc/ppc64/use.mask +++ b/profiles/arch/powerpc/ppc64/use.mask @@ -6,7 +6,7 @@ # Samuli Suominen (24 Nov 2012) # TODO: Keyword and stabilize media-gfx/opencolorio and media-libs/opencv -colorio +color-management opencv # Brent Baude (3 Oct 2008) -- 2.26.2