From d2611de5ec0ee28926ef31b5b0ae55b727527f41 Mon Sep 17 00:00:00 2001 From: Marcus von Appen Date: Thu, 20 Dec 2012 10:48:05 +0000 Subject: - Update to 1.1.2 - Move graphics/openimageio and graphics/py-openimageio into a master/slave port relationship - Remove gcc46 bindings, which creates a corrupted binary on i386 targets - Remove the devel/tbb dependency, which causes problems on graphics/blender PR: ports/170679 ports/172362 ports/172363 Submitted by: Shane Ambler (maintainer) --- graphics/openimageio/files/patch-include__thread.h | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 graphics/openimageio/files/patch-include__thread.h (limited to 'graphics/openimageio/files/patch-include__thread.h') diff --git a/graphics/openimageio/files/patch-include__thread.h b/graphics/openimageio/files/patch-include__thread.h new file mode 100644 index 000000000000..4c0bdb22a5e9 --- /dev/null +++ b/graphics/openimageio/files/patch-include__thread.h @@ -0,0 +1,30 @@ +--- ./include/thread.h.orig 2012-11-10 05:51:18.000000000 +1030 ++++ ./include/thread.h 2012-11-11 17:25:34.547296939 +1030 +@@ -70,9 +70,14 @@ + #pragma GCC diagnostic error "-Wunused-variable" + #endif + ++#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) ++#define USE_GCC_ATOMICS 1 ++#undef USE_TBB ++#else + #ifndef USE_TBB + # define USE_TBB 0 + #endif ++#endif + + // Include files we need for atomic counters. + // Some day, we hope this is all replaced by use of std::atomic<>. +@@ -97,12 +102,6 @@ + # include + #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 +- + OIIO_NAMESPACE_ENTER + { + -- cgit v1.2.3