[Lunar-commits] <moonbase-other> OpenImage-oiio: bump to 1.5.5 and a little clean up of BUILD/DEPENDS.

[Dennis Veatch]

commit a16b6104b2111b7abc5e6d72cb8a253975832688
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Tue, 03 Mar 2015 09:54:15 -0500
URL: https://github.com/lunar-linux/moonbase-other/commit/a16b6104b2111b7abc5e6d72cb8a253975832688

OpenImage-oiio: bump to 1.5.5 and a little clean up of BUILD/DEPENDS.
---
  graphics/OpenImageIO-oiio/BUILD   | +4/-17    
  graphics/OpenImageIO-oiio/DEPENDS | +4/-2     
  graphics/OpenImageIO-oiio/DETAILS | +4/-4     
  3 files changed, 12 insertions(+), 23 deletions(-)

--- a/graphics/OpenImageIO-oiio/BUILD
+++ b/graphics/OpenImageIO-oiio/BUILD
@@ -1,21 +1,8 @@
 
-  if in_depends $MODULE openjpeg ; then
-    OPENJPEG_VER=`lvu version openjpeg | cut -c 1-3` &&
-    OPTS+=" -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$OPENJPEG_VER"
+  if module_installed ffmpeg ; then
+    OPTS+=" -DUSE_FFMPEG=ON"
   fi &&
 
-  if module_installed hdf5 ; then
-    OPTS+=" -DHDF5_LIBRARIES=/usr/lib"
-  fi &&
-
-  OPTS+=" -DEMBEDPLUGINS=OFF -DCMAKE_C_FLAGS=-fPIC -Wno-dev" &&
-
-  # these will both be obsolete with the next version bump
-  sedit "35i #include <string.h>" src/libtexture/texturesys.cpp src/libtexture/imagecache.cpp src/testtex/testtex.cpp &&
-  sedit "163 s/= true/= TRUE/" src/jpeg.imageio/jpegoutput.cpp &&
-
-  cmake $SOURCE_DIRECTORY/src -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
-                              -DCMAKE_BUILD_TYPE=RELEASE            \
-                              $OPTS &&
+  OPTS+=" -DEMBEDPLUGINS=OFF -DCMAKE_C_FLAGS=-fPIC -Wno-dev -DSTOP_ON_WARNING=OFF" &&
 
-  default_make
+  default_cmake_build
--- a/graphics/OpenImageIO-oiio/DEPENDS
+++ b/graphics/OpenImageIO-oiio/DEPENDS
@@ -1,3 +1,4 @@
+depends hdf5
 depends glew
 depends %JPEG
 depends tiff
@@ -6,13 +7,14 @@ depends openexr
 depends boost
 depends libwebp
 
+optional_depends "giflib"    "-DUSE_GIF=ON"          "-DUSE_GIF=OFF"          "for gif image support"
+optional_depends "LibRaw"    "-DUSE_LIBRAW=ON"       "-DUSE_LIBRAW=OFF"       "for raw image support"
 optional_depends "Python"    "-DUSE_PYTHON=ON"       "-DUSE_PYTHON=OFF"       "for Python bindings support"
+optional_depends "opencv"    "-DUSE_OPENCV=ON"       "-DUSE_OPENCV=OFF"       "for open computer vision support"
 optional_depends "openssl"   "-DUSE_OPENSSL=ON"      "-DUSE_OPENSSL=OFF"      "for ssl support"
 optional_depends "openjpeg"  "-DUSE_OPENJPEG=ON"     "-DUSE_OPENJPEG=OFF"     "for openjpeg graphics support"
 optional_depends "freetype2" "-DUSE_FREETYPE=ON"     "-DUSE_FREETPE=OFF"      "for freetype font support"
-optional_depends "tbb"       "-DUSE_EXTERNAL_TBB=ON" "-DUSE_EXTERNAL_TBB=OFF" "if yes use system threaded building blocks"
 optional_depends "qt4"       "-DUSE_QT=ON"           "-DUSE_QT=OFF"           "for image viewing tools support"
-optional_depends "opencv"    "-DUSE_OPENCV=ON"       "-DUSE_OPENCV=OFF"       "for open computer vision support"
 
 optional_depends "imageworks-OpenColorIO" "-DUSE_OCIO=ON"    "-DUSE_OCIO=OFF"    "for OpenColorIO color management support"
 optional_depends "imageworks-Field3D"     "-DUSE_FIELD3D=ON" "-DUSE_FIELD3D=OFF" "for voxel data storage support"
--- a/graphics/OpenImageIO-oiio/DETAILS
+++ b/graphics/OpenImageIO-oiio/DETAILS
@@ -1,12 +1,12 @@
           MODULE=OpenImageIO-oiio
-         VERSION=Release-1.1.10
+         VERSION=Release-1.5.5dev
           SOURCE=$VERSION.tar.gz
       SOURCE_URL=https://github.com/OpenImageIO/oiio/archive/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/oiio-$VERSION
-      SOURCE_VFY=sha1:939bdf1cde9ad2457e9ca93d0836620b155adac1
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/oiio-${VERSION}
+      SOURCE_VFY=sha256:4054a7b8958cc603a88422154390d085fd0b1c776912ccd33377358333cd4024
         WEB_SITE=https://sites.google.com/site/openimageio/
          ENTERED=20130329
-         UPDATED=20130501
+         UPDATED=20150303
            SHORT="library for reading and writing images"
 
 cat << EOF