[OpenImageIO/f16: 16/16] Merge with master.

[Richard Shaw]

commit e985bed97565166a53a9ba1580a6a0844678e930
Merge: 1e124ea f84394c
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Wed Jun 13 21:13:12 2012 -0500

    Merge with master.

 .gitignore                                  |   11 +-
 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-1.0.0-tbb_include.patch         |   13 +
 OpenImageIO-1.0.0-use_external_tbb.patch    |   28 ++
 OpenImageIO-ppc.patch                       |   54 ++++
 OpenImageIO.spec                            |   72 +++++-
 sources                                     |    4 +
 10 files changed, 177 insertions(+), 588 deletions(-)
---
diff --cc OpenImageIO.spec
index ce2069b,5a98a91..da2cef5
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@@ -1,8 -1,8 +1,16 @@@
++<<<<<<< HEAD
 +%global githash1 g1e37127
 +%global githash2 1fa4a20
 +
 +Name:           OpenImageIO
 +Version:        0.10.8
++=======
+ %global githash1 g28ba675
+ %global githash2 2939154
+ 
+ Name:           OpenImageIO
+ Version:        1.0.5
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        Library for reading and writing images
  
@@@ -13,20 -13,18 +21,34 @@@ URL:            https://sites.google.co
  Source0:        https://download.github.com/%{name}-oiio-Release-%{version}-0-%{githash1}.tar.gz
  Source1:        FindTBB.cmake
  
++<<<<<<< HEAD
 +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-no_tbb.patch
 +
 +BuildRequires:  cmake
 +BuildRequires:  boost-devel glew-devel OpenEXR-devel ilmbase-devel
 +BuildRequires:  qt4-devel
++=======
+ Patch0:         OpenImageIO-1.0.0-use_external_tbb.patch
+ Patch1:         OpenImageIO-1.0.0-tbb_include.patch
+ Patch2:         OpenImageIO-ppc.patch
+ 
+ BuildRequires:  cmake
+ BuildRequires:  qt4-devel
+ BuildRequires:  boost-devel glew-devel OpenEXR-devel ilmbase-devel
++>>>>>>> master
  BuildRequires:  python2-devel txt2man
- BuildRequires:  libpng-devel libtiff-devel
+ BuildRequires:  libpng-devel libtiff-devel openjpeg-devel libwebp-devel
  BuildRequires:  zlib-devel jasper-devel
  BuildRequires:  pugixml-devel
++<<<<<<< HEAD
 +%ifarch %{ix86} x86_64 ia64
++=======
+ %ifarch x86_64
++>>>>>>> master
  BuildRequires:  tbb-devel
  %endif
  BuildRequires:  hdf5-devel Field3D-devel
@@@ -63,11 -62,9 +86,17 @@@ Development files for package %{name
  
  %prep
  %setup -q -n %{name}-oiio-%{githash2}
++<<<<<<< HEAD
 +%patch0 -p1 -b .backport
 +%patch1 -p1 -b .atomic
 +%patch2 -p1 -b .tbb
 +%patch3 -p1 -b .zlib
 +%patch4 -p1 -b .no-tbb
++=======
+ %patch0 -p1 -b .exttbb
+ %patch1 -p1 -b .tbbinc
+ %patch2 -p1 -b .ppc
++>>>>>>> master
  
  # Remove bundled pugixml
  rm -f src/include/pugixml.hpp \
@@@ -90,11 -88,15 +120,23 @@@ pushd buil
         -DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \
         -DINSTALL_DOCS:BOOL=FALSE \
         -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
++<<<<<<< HEAD
 +%ifarch %{ix86} x86_64 ia64
 +       -DUSE_TBB:BOOL=TRUE \
 +%else
 +       -DUSE_TBB:BOOL=FALSE \
 +%endif
++=======
+ %ifarch x86_64
+        -DUSE_TBB:BOOL=TRUE \
+        -DUSE_EXTERNAL_TBB=TRUE \
+ %else
+        -DUSE_TBB:BOOL=FALSE \
+ %endif
+ %ifarch ppc ppc64
+        -DNOTHREADS:BOOL=TRUE \
+ %endif
++>>>>>>> master
         ../src
  
  make %{?_smp_mflags}
@@@ -114,7 -116,7 +156,11 @@@ cp -a doc/*.1 %{buildroot}%{_mandir}/ma
  
  
  %check
++<<<<<<< HEAD
 +# Not all unit tests expected to pass.
++=======
+ # Not all tests are expected to pass yet.
++>>>>>>> master
  #pushd build && make test
  
  
@@@ -132,20 -134,24 +178,38 @@@
  
  
  %changelog
++<<<<<<< HEAD
 +* Thu Apr 19 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.10.8-1
 +- Update to latest upstream release.
 +
 +* Mon Apr 09 2012 Dan Horák <dan[at]danny.cz> - 0.10.4-6
 +- fix build without TBB
 +
 +* Mon Mar 12 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.10.4-5
 +- Rebuild for updated Field3D.
 +
 +* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.4-3
 +- Rebuilt for c++ ABI breakage
++=======
+ * Tue Jun 12 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.5-1
+ - Update to latest upstream release.
++>>>>>>> master
+ 
+ * Mon May 07 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.4-2
+ - Rebuild for updated libtiff.
+ - Add OpenColorIO to build requirements.
+ 
+ * Thu May 03 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.4-1
+ - Update to latest upstream release.
  
- * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.4-2
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ * Thu Apr 19 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.3-1
+ - Update to latest upstream release.
+ 
+ * Tue Mar 13 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.0-2
+ - Do not build against TBB for i686 because it fails.
+ 
+ * Fri Mar 02 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0.0-1
+ - Update to latest upstream release.
  
  * Thu Jan 05 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.10.4-1
  - Update to 0.10.4.
diff --cc sources
index 36eebe1,6285f75..7ee2eaa
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +0c52da04fad3333f22433bd5d52cd134  OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
++=======
+ 4c3955348d0232bbd2a8f60ff41ad161  OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz
++>>>>>>> master