From 33da6d42b26d5fab0e3ce9ce0682f0d9f8ed8797 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069@gmail.com>
Date: Wed, 3 Feb 2016 14:35:31 -0600
Subject: [PATCH] Update to latest upstream release.

---
 .gitignore                           |  1 +
 OpenImageIO-gcc6_placement-new.patch | 24 ++++++++++++++++++++++++
 OpenImageIO.spec                     | 10 ++++++++--
 sources                              |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 OpenImageIO-gcc6_placement-new.patch

diff --git a/.gitignore b/.gitignore
index e55332a..cdd7c4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ clog
 /OpenImageIO-1.5.22.tar.gz
 /OpenImageIO-1.6.8.tar.gz
 /OpenImageIO-1.6.9.tar.gz
+/OpenImageIO-1.6.10.tar.gz
diff --git a/OpenImageIO-gcc6_placement-new.patch b/OpenImageIO-gcc6_placement-new.patch
new file mode 100644
index 0000000..d295df5
--- /dev/null
+++ b/OpenImageIO-gcc6_placement-new.patch
@@ -0,0 +1,24 @@
+From f0220c1134a7f565cfd9e2a763d4e723adc0b211 Mon Sep 17 00:00:00 2001
+From: Larry Gritz <lg@larrygritz.com>
+Date: Wed, 3 Feb 2016 11:45:59 -0800
+Subject: [PATCH] Suppress warning/error in pugi for gcc6
+
+---
+ src/libOpenImageIO/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
+index 6994dfd..fd6e4d1 100644
+--- a/src/libOpenImageIO/CMakeLists.txt
++++ b/src/libOpenImageIO/CMakeLists.txt
+@@ -13,6 +13,10 @@ if (NOT USE_EXTERNAL_PUGIXML)
+           ../include/OpenImageIO/pugixml.hpp
+           ../include/OpenImageIO/pugixml.cpp
+     )
++    if (CMAKE_COMPILER_IS_GNUCC AND NOT ${GCC_VERSION} VERSION_LESS 6.0)
++        set_source_files_properties (formatspec.cpp xmp.cpp
++                                     PROPERTIES COMPILE_FLAGS -Wno-error=placement-new)
++    endif ()
+ endif()
+ 
+ set (libOpenImageIO_srcs deepdata.cpp exif.cpp formatspec.cpp imagebuf.cpp
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 310acde..2c67add 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -2,8 +2,8 @@
 #global beta beta1
 
 Name:           OpenImageIO
-Version:        1.6.9
-Release:        4%{?dist}
+Version:        1.6.10
+Release:        1%{?dist}
 Summary:        Library for reading and writing images
 
 Group:          Development/Libraries
@@ -14,6 +14,8 @@ Source0:        https://github.com/%{name}/%{subname}/archive/Release-%{version}
 # Images for test suite
 #Source1:        oiio-images.tar.gz
 
+Patch0:         OpenImageIO-gcc6_placement-new.patch
+
 BuildRequires:  cmake
 BuildRequires:  txt2man
 BuildRequires:  qt4-devel
@@ -95,6 +97,7 @@ Development files for package %{name}
 
 %prep
 %setup -q -n oiio-Release-%{version}
+%patch0 -p1
 
 # Remove bundled pugixml
 rm -f src/include/pugixml.hpp \
@@ -176,6 +179,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Mon Feb  3 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.10-1
+- Update to latest upstream release.
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 65e46fa..dfb0cde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22bbba84acdcc82fbb6f6db647ac57a4  OpenImageIO-1.6.9.tar.gz
+9710be45a57a910a091a8ef18e2336a2  OpenImageIO-1.6.10.tar.gz