From 720b2c665578d6a5d588e96c0e03c2a5304acd42 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 21 Dec 2020 09:49:08 +0100 Subject: install-deps: Install OIIO utils, re-enable package on RPMs. OIIO utils are mandatory for a whole set of tests (Cycles, VSE), and it's a small package, no reason to not install it. Also re-enabling package handling of OIIO on RPM-based distro, not sure why it was disabled but this has become a fairly stable and standard library now, would not expect issues anymore. --- build_files/build_environment/install_deps.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'build_files/build_environment/install_deps.sh') diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index c065b48f6ea..671417214d8 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2086,7 +2086,7 @@ compile_OIIO() { cmake_d="$cmake_d -D USE_OPENCV=OFF" cmake_d="$cmake_d -D BUILD_TESTING=OFF" cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF" - cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF" + cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=ON" cmake_d="$cmake_d -D TXT2MAN=" #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON" #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON" @@ -4072,7 +4072,7 @@ install_DEB() { else check_package_version_ge_lt_DEB libopenimageio-dev $OIIO_VERSION_MIN $OIIO_VERSION_MAX if [ $? -eq 0 -a "$_with_built_openexr" = false ]; then - install_packages_DEB libopenimageio-dev + install_packages_DEB libopenimageio-dev openimageio-tools clean_OIIO else compile_OIIO @@ -4714,13 +4714,13 @@ install_RPM() { INFO "Forced OpenImageIO building, as requested..." compile_OIIO else - #check_package_version_ge_lt_RPM OpenImageIO-devel $OIIO_VERSION_MIN $OIIO_VERSION_MAX - #if [ $? -eq 0 -a $_with_built_openexr == false ]; then - # install_packages_RPM OpenImageIO-devel - # clean_OIIO - #else + check_package_version_ge_lt_RPM OpenImageIO-devel $OIIO_VERSION_MIN $OIIO_VERSION_MAX + if [ $? -eq 0 -a $_with_built_openexr == false ]; then + install_packages_RPM OpenImageIO-devel OpenImageIO-utils + clean_OIIO + else compile_OIIO - #fi + fi fi -- cgit v1.2.3