[arch-commits] Commit in openimageio/trunk (PKGBUILD stdmath.patch)

[Sven-Hendrik Haase]

    Date: Saturday, March 14, 2015 @ 15:46:34
  Author: svenstaro
Revision: 129259

upgpkg: openimageio 1.4.16-1

try to patch fmath.h

Added:
  openimageio/trunk/stdmath.patch
Modified:
  openimageio/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 +++++------
 stdmath.patch |   18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-14 14:45:38 UTC (rev 129258)
+++ PKGBUILD	2015-03-14 14:46:34 UTC (rev 129259)
@@ -13,16 +13,15 @@
 makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa' 'git')
 optdepends=('qt4: iv image viewer'
             'python2: bindings support')
-source=(git+git://github.com/OpenImageIO/oiio.git#tag=Release-${pkgver})
-md5sums=('SKIP')
+source=(git+git://github.com/OpenImageIO/oiio.git#tag=Release-${pkgver}
+        stdmath.patch)
+md5sums=('SKIP'
+         '7b819bf20cf2c13cbde5fc6511e39f35')
 
 prepare() {
   cd oiio
 
-  #curl "https://github.com/OpenImageIO/oiio/pull/982.patch"|patch -Np1
-  #curl "https://github.com/OpenImageIO/oiio/commit/e1150f22f012d8d86f14534eda14bec960e96f3e.patch"|patch -Np1
-  # https://github.com/OpenImageIO/oiio/issues/987
-  #git revert -n 6f0e019
+  patch -Np1 < $srcdir/stdmath.patch
 }
 
 build() {

Added: stdmath.patch
===================================================================
--- stdmath.patch	                        (rev 0)
+++ stdmath.patch	2015-03-14 14:46:34 UTC (rev 129259)
@@ -0,0 +1,18 @@
+diff --git a/src/include/OpenImageIO/fmath.h b/src/include/OpenImageIO/fmath.h
+index 8db8442..751cd07 100644
+--- a/src/include/OpenImageIO/fmath.h
++++ b/src/include/OpenImageIO/fmath.h
+@@ -1298,9 +1298,9 @@ OIIO_NAMESPACE_EXIT
+ 
+ #ifndef _MSC_VER
+  // Some systems have isnan, isinf and isfinite in the std namespace.
+- using std::isnan;
+- using std::isinf;
+- using std::isfinite;
++ using ::isnan;
++ using ::isinf;
++ using OIIO::isfinite;
+ #endif
+ 
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 803000))
+