[OpenImageIO] Update to latest upstream release.

Fri Mar 2 20:27:51 UTC 2012

commit fdddaa9e485af1b14151ec6d93e90bd55457dbb3
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Fri Mar 2 14:27:51 2012 -0600

    Update to latest upstream release.

 .gitignore                                  |    1 +
 OpenImageIO-0.10.0-atomic_test_fix.patch    |  119 ---------
 OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch |   11 -
 OpenImageIO-0.10.2-git_backports.patch      |  379 ---------------------------
 OpenImageIO-0.10.3-use_external_tbb.patch   |   74 ------
 OpenImageIO-0.10.4-gcc47_unistd_h.fix       |   11 -
 OpenImageIO-1.0.0-use_external_tbb.patch    |   28 ++
 OpenImageIO.spec                            |   30 +--
 sources                                     |    2 +-
 9 files changed, 42 insertions(+), 613 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index fd9852a..404c71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
 /OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
 /OpenImageIO-oiio-Release-0.10.4-0-gad1950d.tar.gz
+/OpenImageIO-oiio-Release-1.0.0-0-g5b37f1c.tar.gz
diff --git a/OpenImageIO-1.0.0-use_external_tbb.patch b/OpenImageIO-1.0.0-use_external_tbb.patch
new file mode 100644
index 0000000..ac7db6b
--- /dev/null
+++ b/OpenImageIO-1.0.0-use_external_tbb.patch
@@ -0,0 +1,28 @@
+diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt
+--- OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt	2012-02-28 12:58:45.306847484 -0600
++++ OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt	2012-02-28 13:02:27.438365805 -0600
+@@ -61,7 +61,11 @@
+ endif ()
+ 
+ # Include our own TBB if using it
+-if (USE_TBB)
++if (USE_TBB AND USE_EXTERNAL_TBB)
++    message (STATUS "System TBB library will be used.")
++    set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
++elseif (USE_TBB AND NOT USE_EXTERNAL_TBB)
++    message (STATUS "Built-in TBB library will be used.")
+     set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
+ endif ()
+ 
+diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt
+--- OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt	2012-02-25 17:17:12.000000000 -0600
++++ OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt	2012-02-28 13:32:00.961799696 -0600
+@@ -22,7 +22,7 @@
+ install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
+          COMPONENT developer)
+ 
+-if (USE_TBB)
++if (USE_TBB AND NOT USE_EXTERNAL_TBB)
+     install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR}
+              COMPONENT developer)
+ endif ()
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index a1c0d26..d23d5a9 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,9 +1,9 @@
-%global githash1 gad1950d
-%global githash2 7b7590f
+%global githash1 g5b37f1c
+%global githash2 5b37f1c
 
 Name:           OpenImageIO
-Version:        0.10.4
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Library for reading and writing images
 
 Group:          Development/Libraries
@@ -13,11 +13,7 @@ URL:            https://sites.google.com/site/openimageio/home
 Source0:        https://download.github.com/%{name}-oiio-Release-%{version}-0-%{githash1}.tar.gz
 Source1:        FindTBB.cmake
 
-Patch0:         OpenImageIO-0.10.2-git_backports.patch
-Patch1:         OpenImageIO-0.10.0-atomic_test_fix.patch
-Patch2:         OpenImageIO-0.10.3-use_external_tbb.patch
-Patch3:         OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch
-Patch4:         OpenImageIO-0.10.4-gcc47_unistd_h.fix
+Patch0:         OpenImageIO-1.0.0-use_external_tbb.patch
 
 BuildRequires:  boost-devel glew-devel qt-devel OpenEXR-devel ilmbase-devel
 BuildRequires:  python2-devel txt2man
@@ -25,9 +21,6 @@ BuildRequires:  libpng-devel 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.
-# Field3D Review Request: https://bugzilla.redhat.com/show_bug.cgi?id=753453
 BuildRequires:  hdf5-devel Field3D-devel
 
 # We don't want to provide private python extension libs
@@ -62,11 +55,7 @@ Development files for package %{name}
 
 %prep
 %setup -q -n %{name}-oiio-%{githash2}
-%patch0 -p1 -b .backport
-%patch1 -p1 -b .atomic
-%patch2 -p1 -b .tbb
-%patch3 -p1 -b .zlib
-%patch4 -p1 -b .gcc47
+%patch0 -p1 -b .tbb
 
 # Remove bundled pugixml
 rm -f src/include/pugixml.hpp \
@@ -84,12 +73,14 @@ mkdir -p build
 pushd build
 # CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes
 # CMAKE_INSTALL_RPATH to be cleared, which is the desiered result.
-%cmake -DCMAKE_SKIP_RPATH:BOOL=TRUE \
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+       -DCMAKE_SKIP_RPATH:BOOL=TRUE \
        -DINCLUDE_INSTALL_DIR:PATH=/usr/include/%{name} \
        -DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \
        -DINSTALL_DOCS:BOOL=FALSE \
        -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
        -DUSE_TBB:BOOL=TRUE \
+       -DUSE_EXTERNAL_TBB=TRUE \
        ../src
 
 make %{?_smp_mflags}
@@ -126,6 +117,9 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Fri Mar 02 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.0-1
+- Update to latest upstream release.
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.4-3
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 81a4587..db7fc73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08a1bc2b82862ad5547bba569f4f633f  OpenImageIO-oiio-Release-0.10.4-0-gad1950d.tar.gz
+fa3136f4743fe9775f03769478f21ac5  OpenImageIO-oiio-Release-1.0.0-0-g5b37f1c.tar.gz
