From 3a130363bd9b0e93480c0071788a965c0b6c8efa Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 31 2013 23:59:02 +0000
Subject: Add upstream patch to fix FTBFS on ARM (RHBZ 924932)


---

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 9d6a5a6..f7c5398 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -4,7 +4,7 @@
 
 Name:           OpenImageIO
 Version:        1.1.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Library for reading and writing images
 
 Group:          Development/Libraries
@@ -21,6 +21,8 @@ Patch0:         OpenImageIO-1.1.2-use_external_tbb.patch
 Patch2:         OpenImageIO-ppc.patch
 # https://github.com/OpenImageIO/oiio/issues/473
 Patch3:         OpenImageIO-1.1.3-SHA1_undef_ref.patch
+# https://github.com/The11ers/oiio/commit/010754d2a9b4b41f658a7752046c9217abaf98fc
+Patch4:         oiio-arm.patch
 
 BuildRequires:  cmake txt2man
 BuildRequires:  qt4-devel
@@ -92,6 +94,7 @@ Development files for package %{name}
 %patch2 -p1 -b .ppc
 %endif
 %patch3 -p1 -b .sha1
+%patch4 -p1 -b .arm
 
 # Install FindTBB.cmake
 install %{SOURCE101} src/cmake/modules/
@@ -172,6 +175,9 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Sun Mar 31 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.3-7
+- Add upstream patch to fix FTBFS on ARM (RHBZ 924932)
+
 * Sun Mar 10 2013 Rex Dieter <rdieter@fedoraproject.org> 1.1.3-6
 - rebuild (OpenEXR)
 
diff --git a/oiio-arm.patch b/oiio-arm.patch
new file mode 100644
index 0000000..0c9f732
--- /dev/null
+++ b/oiio-arm.patch
@@ -0,0 +1,26 @@
+--- oiio-Release-1.1.3/src/include/thread.h.orig	2013-04-01 00:27:21.337292586 +0100
++++ oiio-Release-1.1.3/src/include/thread.h	2013-04-01 00:30:08.910886481 +0100
+@@ -326,7 +326,11 @@
+     __TBB_Pause(delay);
+ #elif defined(__GNUC__)
+     for (int i = 0; i < delay; ++i) {
++#if defined __arm__
++        __asm__ __volatile__("NOP;");
++#else 
+         __asm__ __volatile__("pause;");
++#endif 
+     }
+ #elif defined(_MSC_VER)
+     for (int i = 0; i < delay; ++i) {
+@@ -441,7 +445,11 @@
+ 
+     // Disallow copy construction by making private and unimplemented.
+     atomic (atomic const &);
++#if defined __arm__
++} __attribute__((aligned(8)));
++#else 
+ };
++#endif 
+ 
+ 
+ #endif /* ! USE_TBB */