[OpenImageIO] Update to latest upstream release. Upstream has accepted the NOP solution for arm and s390 but some

[Richard Shaw]

commit 6c9f5a1ca4c9c15d29b2d6d683838605e743c776
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Jul 15 15:13:26 2013 -0500

    Update to latest upstream release.
    Upstream has accepted the NOP solution for arm and s390 but some patching may still be necessary.
    TBB is no longer required as the internal spinlocks are faster than the TBB implementation.

 .gitignore           |    1 +
 OpenImageIO.spec     |   20 ++--
 oiio-arm.patch       |   12 --
 oiio-ppc.patch       |    9 --
 oiio-spinlocks.patch |  362 --------------------------------------------------
 sources              |    2 +-
 6 files changed, 12 insertions(+), 394 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecd139c..6fa6dd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
 /oiio-Release-1.1.10.tar.gz
 /oiio-Release-1.1.11.tar.gz
 /oiio-Release-1.1.13.tar.gz
+/oiio-Release-1.2.0.tar.gz
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 82bbb92..75c7891 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,5 +1,5 @@
 Name:           OpenImageIO
-Version:        1.1.13
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Library for reading and writing images
 
@@ -12,11 +12,9 @@ Source0:        https://download.github.com/oiio-Release-%{version}.tar.gz
 #Source1:        oiio-images.tar.gz
 Source101:      FindTBB.cmake
 
-Patch0:         oiio-ppc.patch
-Patch1:         oiio-spinlocks.patch
-Patch2:         oiio-arm.patch
-Patch3:         oiio-s390.patch
-Patch4:         oiio-ppc.patch
+Patch0:         oiio-arm.patch
+Patch1:         oiio-ppc.patch
+Patch2:         oiio-s390.patch
 
 BuildRequires:  cmake txt2man
 BuildRequires:  qt4-devel
@@ -82,10 +80,9 @@ Development files for package %{name}
 
 %prep
 %setup -q -n oiio-Release-%{version}
-%patch1 -p1 -b .spinlocks
-%patch2 -p1 -b .arm
-%patch3 -p1 -b .s390
-%patch4 -p1 -b .ppc
+%patch0 -p1 -b .arm
+%patch1 -p1 -b .ppc
+#patch2 -p1 -b .s390
 
 # Install FindTBB.cmake
 install %{SOURCE101} src/cmake/modules/
@@ -162,6 +159,9 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Fri Jul 15 2013 Richard Shaw <hobbes1069 at gmail.com> - 1.2.0-1
+- Update to latest upstream release.
+
 * Wed Jul  3 2013 Richard Shaw <hobbes1069 at gmail.com> - 1.1.13-1
 - Update to latest bugfix release.
 
diff --git a/oiio-arm.patch b/oiio-arm.patch
index ea2896b..2e83f86 100644
--- a/oiio-arm.patch
+++ b/oiio-arm.patch
@@ -1,17 +1,5 @@
 --- oiio-Release-1.1.10/src/include/thread.h.orig        2013-04-01 00:27:21.337292586 +0100
 +++ oiio-Release-1.1.10/src/include/thread.h     2013-04-01 00:30:08.910886481 +0100
-@@ -326,7 +326,11 @@
- {
- #if defined(__GNUC__)
-     for (int i = 0; i < delay; ++i) {
-+#if defined __arm__
-+        __asm__ __volatile__("NOP;");
-+#else
-         __asm__ __volatile__("pause;");
-+#endif
-     }
- #elif USE_TBB
-     __TBB_Pause(delay);
 @@ -446,7 +450,12 @@
  
      // Disallow copy construction by making private and unimplemented.
diff --git a/oiio-ppc.patch b/oiio-ppc.patch
index 00ef9a0..4b2954a 100644
--- a/oiio-ppc.patch
+++ b/oiio-ppc.patch
@@ -52,12 +52,3 @@ diff -up oiio-Release-1.1.10/src/include/thread.h.ppc oiio-Release-1.1.10/src/in
  #else
  #   error No atomics on this platform.
  #endif
-@@ -326,7 +340,7 @@ pause (int delay)
- {
- #if defined(__GNUC__)
-     for (int i = 0; i < delay; ++i) {
--#if defined __arm__ || defined __s390__
-+#if defined __arm__ || defined __s390__ || defined __powerpc__
-         __asm__ __volatile__("NOP;");
- #else
-         __asm__ __volatile__("pause;");
diff --git a/sources b/sources
index 5d48429..bbe6017 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-976c53880da3d003566e72eb8ebb6ef5  oiio-Release-1.1.13.tar.gz
+4ea4cec743ef84a8c07625fadc8444ca  oiio-Release-1.2.0.tar.gz