[OpenImageIO/f17: 16/17] Prep for merge with master.
Richard Shaw
hobbes1069 at fedoraproject.org
Wed Jun 13 21:20:05 UTC 2012
commit 8f5c66c35b1986b47c3fe160b19dc2cff9569349
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date: Wed Jun 13 16:18:38 2012 -0500
Prep for merge with master.
.gitignore | 6 +-
OpenImageIO-0.10.0-atomic_test_fix.patch | 119 ---------
OpenImageIO-0.10.2-Z_BEST_COMPRESSION.patch | 11 -
OpenImageIO-0.10.2-git_backports.patch | 379 ---------------------------
OpenImageIO-0.10.3-use_external_tbb.patch | 74 ------
OpenImageIO-0.10.4-no_tbb.patch | 18 --
OpenImageIO-1.0.0-tbb_include.patch | 13 +
OpenImageIO-1.0.0-use_external_tbb.patch | 28 ++
OpenImageIO-ppc.patch | 59 ++---
sources | 2 +-
10 files changed, 63 insertions(+), 646 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7699fe1..6e1ea50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@
/OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
/OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
/OpenImageIO-oiio-Release-0.10.4-0-gad1950d.tar.gz
-/OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
+/OpenImageIO-oiio-Release-1.0.0-0-g5b37f1c.tar.gz
+/OpenImageIO-oiio-Release-1.0.3-0-gdffc74e.tar.gz
+clog
+/OpenImageIO-oiio-Release-1.0.4-0-g513d0dd.tar.gz
+/OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz
diff --git a/OpenImageIO-1.0.0-tbb_include.patch b/OpenImageIO-1.0.0-tbb_include.patch
new file mode 100644
index 0000000..47151af
--- /dev/null
+++ b/OpenImageIO-1.0.0-tbb_include.patch
@@ -0,0 +1,13 @@
+diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/libutil/tbb_misc.cpp OpenImageIO-oiio-5b37f1c/src/libutil/tbb_misc.cpp
+--- OpenImageIO-oiio-5b37f1c.orig/src/libutil/tbb_misc.cpp 2012-02-25 17:17:12.000000000 -0600
++++ OpenImageIO-oiio-5b37f1c/src/libutil/tbb_misc.cpp 2012-03-04 17:00:29.519842011 -0600
+@@ -30,8 +30,7 @@
+ // an executing program.
+
+ #include "tbb/tbb_stddef.h"
+-// Out-of-line TBB assertion handling routines are instantiated here.
+-#include "tbb/tbb_assert_impl.h"
++#include "tbb/tbb_machine.h"
+
+ #include "tbb/tbb_misc.h"
+ #include <cstdio>
diff --git a/OpenImageIO-1.0.0-use_external_tbb.patch b/OpenImageIO-1.0.0-use_external_tbb.patch
new file mode 100644
index 0000000..ac7db6b
--- /dev/null
+++ b/OpenImageIO-1.0.0-use_external_tbb.patch
@@ -0,0 +1,28 @@
+diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt
+--- OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt 2012-02-28 12:58:45.306847484 -0600
++++ OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt 2012-02-28 13:02:27.438365805 -0600
+@@ -61,7 +61,11 @@
+ endif ()
+
+ # Include our own TBB if using it
+-if (USE_TBB)
++if (USE_TBB AND USE_EXTERNAL_TBB)
++ message (STATUS "System TBB library will be used.")
++ set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
++elseif (USE_TBB AND NOT USE_EXTERNAL_TBB)
++ message (STATUS "Built-in TBB library will be used.")
+ set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
+ endif ()
+
+diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt
+--- OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt 2012-02-25 17:17:12.000000000 -0600
++++ OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt 2012-02-28 13:32:00.961799696 -0600
+@@ -22,7 +22,7 @@
+ install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
+ COMPONENT developer)
+
+-if (USE_TBB)
++if (USE_TBB AND NOT USE_EXTERNAL_TBB)
+ install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR}
+ COMPONENT developer)
+ endif ()
diff --git a/OpenImageIO-ppc.patch b/OpenImageIO-ppc.patch
index 15642eb..7950cb9 100644
--- a/OpenImageIO-ppc.patch
+++ b/OpenImageIO-ppc.patch
@@ -1,16 +1,16 @@
-diff -up OpenImageIO-oiio-1fa4a20/src/include/thread.h.ppckh OpenImageIO-oiio-1fa4a20/src/include/thread.h
---- OpenImageIO-oiio-1fa4a20/src/include/thread.h.ppckh 2012-04-25 15:29:32.530321567 +0200
-+++ OpenImageIO-oiio-1fa4a20/src/include/thread.h 2012-04-25 15:29:42.490320642 +0200
-@@ -256,7 +256,7 @@ private:
- inline int
- atomic_exchange_and_add (volatile int *at, int x)
- {
--#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
-+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) && ! defined(__PPC__)
- return __sync_fetch_and_add ((int *)at, x);
- #elif USE_TBB
- atomic<int> *a = (atomic<int> *)at;
-@@ -267,6 +267,11 @@ atomic_exchange_and_add (volatile int *a
+diff -Naur OpenImageIO-oiio-2939154.orig/src/include/thread.h OpenImageIO-oiio-2939154/src/include/thread.h
+--- OpenImageIO-oiio-2939154.orig/src/include/thread.h 2012-06-04 12:30:16.000000000 -0500
++++ OpenImageIO-oiio-2939154/src/include/thread.h 2012-06-13 15:14:36.648990016 -0500
+@@ -103,7 +103,7 @@
+ #endif
+
+ #if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
+-#if !defined(__FreeBSD__) || defined(__x86_64__)
++#if !defined(__FreeBSD__) && !defined(__PPC__) || defined(__x86_64__)
+ #define USE_GCC_ATOMICS
+ #endif
+ #endif
+@@ -272,6 +272,11 @@
#elif defined(_WIN32)
// Windows
return _InterlockedExchangeAdd ((volatile LONG *)at, x);
@@ -22,16 +22,7 @@ diff -up OpenImageIO-oiio-1fa4a20/src/include/thread.h.ppckh OpenImageIO-oiio-1f
#else
# error No atomics on this platform.
#endif
-@@ -277,7 +282,7 @@ atomic_exchange_and_add (volatile int *a
- inline long long
- atomic_exchange_and_add (volatile long long *at, long long x)
- {
--#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
-+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) && ! defined(__PPC__)
- return __sync_fetch_and_add (at, x);
- #elif USE_TBB
- atomic<long long> *a = (atomic<long long> *)at;
-@@ -292,6 +297,11 @@ atomic_exchange_and_add (volatile long l
+@@ -297,6 +302,11 @@
# else
return InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
# endif
@@ -43,16 +34,7 @@ diff -up OpenImageIO-oiio-1fa4a20/src/include/thread.h.ppckh OpenImageIO-oiio-1f
#else
# error No atomics on this platform.
#endif
-@@ -308,7 +318,7 @@ atomic_exchange_and_add (volatile long l
- inline bool
- atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
- {
--#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
-+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) && ! defined (__PPC__)
- return __sync_bool_compare_and_swap (at, compareval, newval);
- #elif USE_TBB
- atomic<int> *a = (atomic<int> *)at;
-@@ -317,6 +327,8 @@ atomic_compare_and_exchange (volatile in
+@@ -322,6 +332,8 @@
return OSAtomicCompareAndSwap32Barrier (compareval, newval, at);
#elif defined(_WIN32)
return (_InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
@@ -61,16 +43,7 @@ diff -up OpenImageIO-oiio-1fa4a20/src/include/thread.h.ppckh OpenImageIO-oiio-1f
#else
# error No atomics on this platform.
#endif
-@@ -327,7 +339,7 @@ atomic_compare_and_exchange (volatile in
- inline bool
- atomic_compare_and_exchange (volatile long long *at, long long compareval, long long newval)
- {
--#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
-+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) && ! defined (__PPC__)
- return __sync_bool_compare_and_swap (at, compareval, newval);
- #elif USE_TBB
- atomic<long long> *a = (atomic<long long> *)at;
-@@ -336,6 +348,8 @@ atomic_compare_and_exchange (volatile lo
+@@ -341,6 +353,8 @@
return OSAtomicCompareAndSwap64Barrier (compareval, newval, at);
#elif defined(_WIN32)
return (_InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
diff --git a/sources b/sources
index 36eebe1..6285f75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c52da04fad3333f22433bd5d52cd134 OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz
+4c3955348d0232bbd2a8f60ff41ad161 OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz
More information about the scm-commits
mailing list