Skip to content

Commit

Permalink
*/*: USE colorio -> color-management
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/613274
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Jun 10, 2019
1 parent 6d4e4cb commit 855e6bc
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 19 deletions.
6 changes: 3 additions & 3 deletions media-gfx/blender/blender-2.79b-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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?] )
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 1 addition & 6 deletions media-gfx/blender/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@
<email>[email protected]</email>
<name>Gentoo Graphics Project</name>
</maintainer>

<longdescription>
Blender, the open source software for 3D modeling, animation,
rendering, post-production, interactive creation and playback.
</longdescription>

<use>
<flag name="bullet">
Enable Bullet (Physics Engine).
Expand All @@ -27,10 +25,7 @@
Add support for Collada interchange format through
<pkg>media-libs/opencollada</pkg>.
</flag>
<flag name="colorio">
Enable OpenColorIO color management through
<pkg>media-libs/opencolorio</pkg>.
</flag>
<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg>.</flag>
<flag name="cuda">
Build cycles renderer with nVidia CUDA support.
</flag>
Expand Down
2 changes: 1 addition & 1 deletion media-libs/openimageio/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<use>
<flag name="cpu_flags_x86_avx512f">SIMD Optimization</flag>
<flag name="cpu_flags_x86_f16c">SIMD Optimization</flag>
<flag name="colorio">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
<flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag>
<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
Expand Down
7 changes: 3 additions & 4 deletions media-libs/openimageio/openimageio-1.6.13.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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= )
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions media-libs/openimageio/openimageio-1.8.17.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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= )
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion profiles/arch/powerpc/ppc64/use.mask
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Samuli Suominen <[email protected]> (24 Nov 2012)
# TODO: Keyword and stabilize media-gfx/opencolorio and media-libs/opencv
colorio
color-management
opencv

# Brent Baude <[email protected]> (3 Oct 2008)
Expand Down

0 comments on commit 855e6bc

Please sign in to comment.