From owner-svn-ports-all@FreeBSD.ORG  Mon Jan 21 09:23:34 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DB278F7A;
 Mon, 21 Jan 2013 09:23:34 +0000 (UTC) (envelope-from vd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9D3DCA31;
 Mon, 21 Jan 2013 09:23:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0L9NYSO044205;
 Mon, 21 Jan 2013 09:23:34 GMT (envelope-from vd@svn.freebsd.org)
Received: (from vd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0L9NYg3044203;
 Mon, 21 Jan 2013 09:23:34 GMT (envelope-from vd@svn.freebsd.org)
Message-Id: <201301210923.r0L9NYg3044203@svn.freebsd.org>
From: Vasil Dimov <vd@FreeBSD.org>
Date: Mon, 21 Jan 2013 09:23:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310757 - head/graphics/hugin/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jan 2013 09:23:34 -0000

Author: vd
Date: Mon Jan 21 09:23:33 2013
New Revision: 310757
URL: http://svnweb.freebsd.org/changeset/ports/310757

Log:
  Make graphics/hugin compilable with clang.
  
  PR:		ports/175427
  Submitted by:	Rainer Hurling <rhurlin@gwdg.de>

Added:
  head/graphics/hugin/files/patch-src__foreign__flann__util__logger.h   (contents, props changed)
  head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h   (contents, props changed)

Added: head/graphics/hugin/files/patch-src__foreign__flann__util__logger.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hugin/files/patch-src__foreign__flann__util__logger.h	Mon Jan 21 09:23:33 2013	(r310757)
@@ -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

Added: head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h	Mon Jan 21 09:23:33 2013	(r310757)
@@ -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));
+ 
+   }