- rel 2; fix atomics patch

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 72fae374a7f7890f47f20cec1badc3746e37ce36..83469b5c604e240fe7f77806748544d53a7c8a19 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -9,7 +9,7 @@ Summary:        Library for reading and writing images
 Summary(pl.UTF-8):     Biblioteka do odczytu i zapisu obrazów
 Name:          OpenImageIO
 Version:       1.2.3
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz

diff --git a/no-gcc-atomics.patch b/no-gcc-atomics.patch
index 6f056cb664457e430f29424a45a3866edb501a98..462462e1b49efe3d2fd302343f459336eb6c4bf0 100644 (file)
--- a/no-gcc-atomics.patch
+++ b/no-gcc-atomics.patch
@@ -1,14 +1,12 @@
---- OpenImageIO-oiio-e9fa4c7/src/include/thread.h~     2012-07-09 08:28:46.000000000 +0200
-+++ OpenImageIO-oiio-e9fa4c7/src/include/thread.h      2012-07-12 00:36:54.502654305 +0200
-@@ -102,11 +102,7 @@
- #  include <libkern/OSAtomic.h>
+--- OpenImageIO-oiio-bcdad81/src/include/thread.h~     2013-11-01 18:03:46.000000000 +0100
++++ OpenImageIO-oiio-bcdad81/src/include/thread.h      2013-11-05 21:54:05.234898906 +0100
+@@ -111,9 +111,7 @@
+ #  endif
  #endif
  
 -#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
--#if !defined(__FreeBSD__) || defined(__x86_64__)
 -#define USE_GCC_ATOMICS
 -#endif
--#endif
 +#undef USE_GCC_ATOMICS
  
  OIIO_NAMESPACE_ENTER