Enabled new openexr for RPM-based distro. Checked with FC18/amd64 for now, will check...
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 25 May 2013 09:31:45 +0000 (09:31 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 25 May 2013 09:31:45 +0000 (09:31 +0000)
build_files/build_environment/install_deps.sh

index f3cb606b14ca9d5efff7f0173106dc6e41764b7a..ca490b2cdfe7d3fd3f01e0e70a9588993a80c28d 100755 (executable)
@@ -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