[OpenImageIO] Update to 0.10.3 Rebuild for libpng 1.5. Fixed bulding against tbb library.

Sat Nov 5 21:24:05 UTC 2011

commit 1a39c4a653ed9c91209aed8a490497fbf93a85da
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Sat Nov 5 16:23:41 2011 -0500

    Update to 0.10.3
    Rebuild for libpng 1.5.
    Fixed bulding against tbb library.

 .gitignore                                  |    1 +
 OpenImageIO-0.10.0-git_backports.patch      |  380 ---------------------------
 OpenImageIO-0.10.0-use_system_tbb.patch     |   31 ---
 OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch |   11 +
 OpenImageIO-0.10.3-use_system_tbb.patch     |   25 ++
 OpenImageIO.spec                            |   25 +-
 sources                                     |    2 +-
 7 files changed, 53 insertions(+), 422 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index df43ea7..0a67a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /OpenImageIO-oiio-Release-0.10.0-12-g8055b0f.tar.gz
 /OpenImageIO-oiio-Release-0.10.1-0-g8c102cf.tar.gz
 /OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
+/OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
diff --git a/OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch b/OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
new file mode 100644
index 0000000..4aa138e
--- /dev/null
+++ b/OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
@@ -0,0 +1,11 @@
+diff -Naur OpenImageIO-oiio-1c4030e.orig/src/ico.imageio/icooutput.cpp OpenImageIO-oiio-1c4030e/src/ico.imageio/icooutput.cpp
+--- OpenImageIO-oiio-1c4030e.orig/src/ico.imageio/icooutput.cpp	2011-08-06 12:56:10.000000000 -0500
++++ OpenImageIO-oiio-1c4030e/src/ico.imageio/icooutput.cpp	2011-11-05 14:29:27.850429691 -0500
+@@ -31,6 +31,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cmath>
++#include <zlib.h>
+ 
+ #include "ico.h"
+ #include "../png.imageio/png_pvt.h"
diff --git a/OpenImageIO-0.10.3-use_system_tbb.patch b/OpenImageIO-0.10.3-use_system_tbb.patch
new file mode 100644
index 0000000..585e3a0
--- /dev/null
+++ b/OpenImageIO-0.10.3-use_system_tbb.patch
@@ -0,0 +1,25 @@
+diff -Naur OpenImageIO-oiio-7d98ca6.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-7d98ca6/src/libOpenImageIO/CMakeLists.txt
+--- OpenImageIO-oiio-7d98ca6.orig/src/libOpenImageIO/CMakeLists.txt	2011-11-05 14:58:12.807482262 -0500
++++ OpenImageIO-oiio-7d98ca6/src/libOpenImageIO/CMakeLists.txt	2011-11-05 15:24:19.934139140 -0500
+@@ -62,7 +62,7 @@
+ # Include our own TBB if using it
+ if (USE_TBB)
+     add_definitions ("-DUSE_TBB=1")
+-    set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
++    include_directories(SYSTEM "/usr/include")
+ else ()
+     add_definitions ("-DUSE_TBB=0")
+     message (STATUS "TBB will not be used")
+diff -Naur OpenImageIO-oiio-7d98ca6.orig/src/include/CMakeLists.txt OpenImageIO-oiio-7d98ca6/src/include/CMakeLists.txt
+--- OpenImageIO-oiio-7d98ca6.orig/src/include/CMakeLists.txt	2011-11-05 15:42:23.297182938 -0500
++++ OpenImageIO-oiio-7d98ca6/src/include/CMakeLists.txt	2011-11-05 16:01:10.691264012 -0500
+@@ -21,9 +21,3 @@
+ 
+ install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
+          COMPONENT developer)
+-
+-if (USE_TBB)
+-    install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR}
+-             COMPONENT developer)
+-endif ()
+-
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 91667e8..b2e0c8e 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,22 +1,24 @@
 Name:           OpenImageIO
-Version:        0.10.2
-Release:        2%{?dist}
+Version:        0.10.3
+Release:        1%{?dist}
 Summary:        Library for reading and writing images
 
 Group:          Development/Libraries
 License:        BSD
 URL:            https://sites.google.com/site/openimageio/home
 
-Source0:        https://download.github.com/%{name}-oiio-Release-%{version}-0-g7a6cba8.tar.gz
+Source0:        https://download.github.com/%{name}-oiio-Release-%{version}-0-ge93cd33.tar.gz
 Patch0:         OpenImageIO-0.10.2-git_backports.patch
 Patch1:         OpenImageIO-0.10.0-atomic_test_fix.patch
-Patch2:         OpenImageIO-0.10.0-use_system_tbb.patch
+Patch2:         OpenImageIO-0.10.3-use_system_tbb.patch
+Patch3:         OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
 
 BuildRequires:  boost-devel glew-devel qt-devel OpenEXR-devel ilmbase-devel
 BuildRequires:  python2-devel txt2man
 BuildRequires:  libpng libtiff-devel
 BuildRequires:  zlib-devel jasper-devel
 BuildRequires:  pugixml-devel
+BuildRequires:  tbb-devel
 # Field3D support is not considered stable at this time and no package
 # currently exists for Fedora. Re-enable when fixed.
 #BuildRequires:  hdf5-devel Field3D-devel
@@ -51,16 +53,17 @@ Development files for package %{name}
 
 
 %prep
-%setup -q -n %{name}-oiio-1c4030e
+%setup -q -n %{name}-oiio-7d98ca6
 %patch0 -p1 -b .backport
 %patch1 -p1 -b .atomic
 %patch2 -p1 -b .tbb
+%patch3 -p1 -b .zlib
 
 # Remove bundled pugixml
 rm -f src/include/pugixml.hpp \
       src/include/pugiconfig.hpp \
       src/libutil/pugixml.cpp 
-
+# Remove bundled tbb
 rm -rf src/include/tbb
 
 
@@ -72,7 +75,7 @@ pushd build
        -DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \
        -DINSTALL_DOCS:BOOL=OFF \
        -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
-       -DUSE_TBB:BOOL=OFF \
+       -DUSE_TBB:BOOL=ON \
        ../src
 
 make %{?_smp_mflags}
@@ -106,11 +109,13 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
-* Sat Nov 05 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.2-2
-- Rebuild for new libpng.
+* Sat Nov 05 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.3-1
+- Update to 0.10.3
+- Rebuild for libpng 1.5.
+- Fixed bulding against tbb library.
 
 * Thu Aug 27 2011 Tom Callaway <spot at fedoraproject.org> - 0.10.2-1
-- update to 0.10.2
+- Update to 0.10.2
 
 * Thu Aug 04 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.1-2
 - New upstream release.
diff --git a/sources b/sources
index 42f97df..2355684 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b5c25021db20325bfb56b7648078b53  OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
+20c0867864ee6b1cfccc45a0460c12bc  OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
