From e082aad99f9031b4dd6b391a6c5ac717948618fc Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 25 May 2013 09:31:45 +0000 Subject: Enabled new openexr for RPM-based distro. Checked with FC18/amd64 for now, will check with Suse later. --- build_files/build_environment/install_deps.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 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 f3cb606b14c..ca490b2cdfe 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2167,8 +2167,9 @@ install_RPM() { THEORA_USE=true if [ $RPM = "FEDORA" -o $RPM = "RHEL" ]; then + OPENEXR_DEV="openexr-devel" - _packages="$_packages libsqlite3x-devel openexr-devel fftw-devel SDL-devel" + _packages="$_packages libsqlite3x-devel fftw-devel SDL-devel" if $WITH_ALL; then _packages="$_packages jack-audio-connection-kit-devel" @@ -2204,8 +2205,9 @@ install_RPM() { fi elif [ $RPM = "SUSE" ]; then + OPENEXR_DEV="libopenexr-devel" - _packages="$_packages cmake sqlite3-devel libopenexr-devel fftw3-devel libSDL-devel" + _packages="$_packages cmake sqlite3-devel fftw3-devel libSDL-devel" INFO "" install_packages_RPM $_packages @@ -2302,12 +2304,24 @@ install_RPM() { fi fi + INFO "" + if $OPENEXR_SKIP; then + INFO "WARNING! Skipping OpenEXR installation, as requested..." + else + check_package_version_ge_RPM $OPENEXR_DEV $OPENEXR_VERSION_MIN + if [ $? -eq 0 ]; then + install_packages_RPM $OPENEXR_DEV + else + compile_OPENEXR + fi + fi + INFO "" if $OIIO_SKIP; then INFO "WARNING! Skipping OpenImageIO installation, as requested..." else check_package_version_ge_RPM OpenImageIO-devel $OIIO_VERSION_MIN - if [ $? -eq 0 ]; then + if [ $? -eq 0 -a $_with_built_openexr == false ]; then install_packages_RPM OpenImageIO-devel else compile_OIIO -- cgit v1.2.3