diff options
| author | vd <vd@FreeBSD.org> | 2013-01-21 17:23:33 +0800 |
|---|---|---|
| committer | vd <vd@FreeBSD.org> | 2013-01-21 17:23:33 +0800 |
| commit | e9559647405a2b8a96f02bea2c9a460b674f63fa (patch) | |
| tree | b5c86e3dfc80793b5d655f14f49bc52b4ef5a2e8 /graphics/hugin | |
| parent | 24766977be060dad8b861b5377204e91e0b596c6 (diff) | |
| download | freebsd-ports-gnome-e9559647405a2b8a96f02bea2c9a460b674f63fa.tar.gz freebsd-ports-gnome-e9559647405a2b8a96f02bea2c9a460b674f63fa.tar.zst freebsd-ports-gnome-e9559647405a2b8a96f02bea2c9a460b674f63fa.zip | |
Make graphics/hugin compilable with clang.
PR: ports/175427
Submitted by: Rainer Hurling <rhurlin@gwdg.de>
Diffstat (limited to 'graphics/hugin')
| -rw-r--r-- | graphics/hugin/files/patch-src__foreign__flann__util__logger.h | 10 | ||||
| -rw-r--r-- | graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h | 30 |
2 files changed, 40 insertions, 0 deletions
diff --git a/graphics/hugin/files/patch-src__foreign__flann__util__logger.h b/graphics/hugin/files/patch-src__foreign__flann__util__logger.h new file mode 100644 index 000000000000..9309c8b18109 --- /dev/null +++ b/graphics/hugin/files/patch-src__foreign__flann__util__logger.h @@ -0,0 +1,10 @@ +--- src/foreign/flann/util/logger.h.orig 2013-01-18 09:26:49.000000000 +0200 ++++ src/foreign/flann/util/logger.h 2013-01-18 09:26:20.000000000 +0200 +@@ -32,6 +32,7 @@ + #define LOGGER_H + + #include <cstdio> ++#include <stdarg.h> + #include "flann/general.h" + + namespace flann diff --git a/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h b/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h new file mode 100644 index 000000000000..84cdcbb741e4 --- /dev/null +++ b/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h @@ -0,0 +1,30 @@ +--- src/foreign/zthread/include/zthread/Guard.h.orig 2011-12-02 18:02:37.253022000 +0100 ++++ src/foreign/zthread/include/zthread/Guard.h 2013-01-18 19:08:14.000000000 +0100 +@@ -108,7 +108,7 @@ + } + + template <class LockType> +- static void createScope(LockHolder<LockType>& l, unsigned long ms) { ++ static bool createScope(LockHolder<LockType>& l, unsigned long ms) { + + if(Scope1::createScope(l, ms)) + if(!Scope2::createScope(l, ms)) { +@@ -428,8 +428,8 @@ + template <class U, class V> + Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { + +- LockingPolicy::shareScope(*this, extract(g)); +- ++ LockingPolicy::shareScope(*this, this->extract(g)); ++ + } + + /** +@@ -458,7 +458,7 @@ + template <class U, class V> + Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { + +- LockingPolicy::transferScope(*this, extract(g)); ++ LockingPolicy::transferScope(*this, this->extract(g)); + + } |