diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2013-09-27 01:19:33 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2013-09-27 01:19:33 +0800 |
| commit | 117233b3eabb7c46b08cf3e7d5ddabfc97b55444 (patch) | |
| tree | 05e8c964a75667c5b8e9a304e5af3ff4ce50178a /graphics/osg/files | |
| parent | 064579a538acdd5bbaf3fead07c04c25541aead1 (diff) | |
| download | freebsd-ports-gnome-117233b3eabb7c46b08cf3e7d5ddabfc97b55444.tar.gz freebsd-ports-gnome-117233b3eabb7c46b08cf3e7d5ddabfc97b55444.tar.zst freebsd-ports-gnome-117233b3eabb7c46b08cf3e7d5ddabfc97b55444.zip | |
- Fix build with clang
- Support staging
- Convert to new LIB_DEPENDS syntax and OPTIONS features
PR: 182205
Submitted by: nemysis <nemysis@FreeBSD.org>
Diffstat (limited to 'graphics/osg/files')
| -rw-r--r-- | graphics/osg/files/patch-include-OpenThreads-Atomic | 11 | ||||
| -rw-r--r-- | graphics/osg/files/patch-include-osg-Math | 29 | ||||
| -rw-r--r-- | graphics/osg/files/patch-src-OpenThreads-common-Atomic.cpp | 11 |
3 files changed, 51 insertions, 0 deletions
diff --git a/graphics/osg/files/patch-include-OpenThreads-Atomic b/graphics/osg/files/patch-include-OpenThreads-Atomic new file mode 100644 index 000000000000..3061b662a747 --- /dev/null +++ b/graphics/osg/files/patch-include-OpenThreads-Atomic @@ -0,0 +1,11 @@ +--- include/OpenThreads/Atomic.orig 2011-01-31 12:35:50.000000000 +0100 ++++ include/OpenThreads/Atomic 2013-09-18 12:41:22.000000000 +0200 +@@ -241,7 +241,7 @@ + AtomicPtr::assign(void* ptrNew, const void* const ptrOld) + { + #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) +- return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew); ++ return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew); + #elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS) + return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew); + #elif defined(_OPENTHREADS_ATOMIC_USE_SUN) diff --git a/graphics/osg/files/patch-include-osg-Math b/graphics/osg/files/patch-include-osg-Math new file mode 100644 index 000000000000..a53261098173 --- /dev/null +++ b/graphics/osg/files/patch-include-osg-Math @@ -0,0 +1,29 @@ +--- include/osg/Math.orig 2011-05-26 20:52:08.000000000 +0400 ++++ include/osg/Math 2013-09-24 22:00:59.252519925 +0400 +@@ -20,7 +20,7 @@ + + //certain math functions were not defined until 10.2 + //so this code checks the version so it can add in workarounds for older versions. +-#ifdef __APPLE__ ++#if defined(__APPLE__) + // Using std::isnan will work for OS X, but use of <cmath> + // and std:: are not necessarily portible with other systems so + // the include of <cmath> is isolated here. +@@ -38,6 +38,8 @@ + #define APPLE_PRE_10_2 + #endif + #endif ++#elif defined(__FreeBSD__) ++#include <cmath> + #endif + + #if defined(_MSC_VER) +@@ -207,7 +209,7 @@ + inline bool isNaN(float v) { return _isnan(v)!=0; } + inline bool isNaN(double v) { return _isnan(v)!=0; } + #else +- #if defined(__APPLE__) ++ #if defined(__APPLE__) || defined(__FreeBSD__) + inline bool isNaN(float v) { return std::isnan(v); } + inline bool isNaN(double v) { return std::isnan(v); } + #else diff --git a/graphics/osg/files/patch-src-OpenThreads-common-Atomic.cpp b/graphics/osg/files/patch-src-OpenThreads-common-Atomic.cpp new file mode 100644 index 000000000000..ef439e271090 --- /dev/null +++ b/graphics/osg/files/patch-src-OpenThreads-common-Atomic.cpp @@ -0,0 +1,11 @@ +--- src/OpenThreads/common/Atomic.cpp.orig 2011-04-19 13:40:22.000000000 +0200 ++++ src/OpenThreads/common/Atomic.cpp 2013-09-18 11:26:03.000000000 +0200 +@@ -143,7 +143,7 @@ + AtomicPtr::assign(void* ptrNew, const void* const ptrOld) + { + #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) +- return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew); ++ return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew); + #elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED) + return ptrOld == InterlockedCompareExchangePointer((PVOID volatile*)&_ptr, (PVOID)ptrNew, (PVOID)ptrOld); + #elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) |