From a177a33212b60ae7a3003eeeccabb9420322cb63 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 30 Aug 2013 23:32:55 +0000
Subject: [PATCH] community/openimageio: remove arm.patch

---
 community/openimageio/PKGBUILD  |  9 ++-------
 community/openimageio/arm.patch | 29 -----------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 community/openimageio/arm.patch

diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index aa4ba849a..9ccd40a6e 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -4,7 +4,6 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - removed intel-tbb from deps, set -DUSE_TBB=0
-#  - patch to block out x86 asm (https://github.com/OpenImageIO/oiio/pull/546)
 
 pkgname=openimageio
 pkgver=1.2.1
@@ -17,16 +16,12 @@ depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio')
 makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
 optdepends=('qt4: iv image viewer'
             'python2: bindings support')
-source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver
-        arm.patch)
-md5sums=('c98d002c9ec843b7cc35d7aec5f03326'
-         'd3a81f05892a747e922aed541059aade')
+source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
+md5sums=('c98d002c9ec843b7cc35d7aec5f03326')
 
 build() {
   cd "$srcdir"/$_pkgname*
 
-  patch -p1 -i "$srcdir"/arm.patch
-
   cd src
 
   [[ -d build ]] && rm -r build
diff --git a/community/openimageio/arm.patch b/community/openimageio/arm.patch
deleted file mode 100644
index 54e7573b7..000000000
--- a/community/openimageio/arm.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN a/src/include/thread.h b/src/include/thread.h
---- a/src/include/thread.h	2013-07-08 13:47:25.000000000 -0600
-+++ b/src/include/thread.h	2013-07-13 14:30:25.709073357 -0600
-@@ -323,8 +323,12 @@
- #if defined __arm__ || defined __s390__
-         __asm__ __volatile__("NOP;");
- #else
-+#if defined __arm__
-+        __asm__ __volatile__("NOP;");
-+#else
-         __asm__ __volatile__("pause;");
- #endif
-+#endif
-     }
- #elif USE_TBB
-     __TBB_Pause(delay);
-@@ -447,7 +451,12 @@
- 
-     // Disallow copy construction by making private and unimplemented.
-     atomic (atomic const &);
-+
-+#if defined __arm__
-+} __attribute__((aligned(8)));
-+#else
- };
-+#endif
- 
- 
- #endif /* ! USE_TBB_ATOMIC */