svn commit: r312429 - in head/graphics/hugin: . files

[Vasil Dimov]

Author: vd
Date: Sun Feb 17 17:12:59 2013
New Revision: 312429
URL: http://svnweb.freebsd.org/changeset/ports/312429

Log:
  Upgrade graphics/hugin from 2011.4.0 to 2012.0.0
  
  Submitted by:	grog@

Deleted:
  head/graphics/hugin/files/patch-CMakeModules__FindTclap.cmake
  head/graphics/hugin/files/patch-src__foreign__flann__util__logger.h
  head/graphics/hugin/files/tclap-1.2.1-headers.shar
Modified:
  head/graphics/hugin/Makefile
  head/graphics/hugin/distinfo
  head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h

Modified: head/graphics/hugin/Makefile
==============================================================================
--- head/graphics/hugin/Makefile	Sun Feb 17 16:47:06 2013	(r312428)
+++ head/graphics/hugin/Makefile	Sun Feb 17 17:12:59 2013	(r312429)
@@ -2,24 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	hugin
-PORTVERSION=	2011.4.0
-PORTREVISION=	5
+PORTVERSION=	2012.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	vd at FreeBSD.org
 COMMENT=	A GUI for Panorama Tools, to stitch panoramic images
 
-LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
+		Imath:${PORTSDIR}/graphics/ilmbase \
+		boost_thread:${PORTSDIR}/devel/boost-libs \
 		exiv2.12:${PORTSDIR}/graphics/exiv2 \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		lensfun:${PORTSDIR}/graphics/lensfun \
 		pano13:${PORTSDIR}/graphics/libpano13 \
-		boost_thread:${PORTSDIR}/devel/boost-libs \
-		IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		Imath:${PORTSDIR}/graphics/ilmbase
-# gmake is really needed at _runtime_, do not remove it from below
+		png15:${PORTSDIR}/graphics/png \
+		tiff:${PORTSDIR}/graphics/tiff
+BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20 \
+		tclap>=1.2.1:${PORTSDIR}/devel/tclap
+# gmake is really needed at _runtime_.   Do not remove it from this list.
 RUN_DEPENDS=	enblend>=3.1.r20080615:${PORTSDIR}/graphics/enblend \
 		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		gmake:${PORTSDIR}/devel/gmake
@@ -72,15 +74,6 @@ MAN1=		\
 
 #DOCSDIR=	${PREFIX}/share/hugin/xrc/data
 
-# Extract the tclap library in a place where hugin's CMake scripts will find
-# it. This library is entirely composed of .h files and does not need
-# to be compiled or configured. This dependency would best be done if tclap
-# is added as a separate port, but it does not seem eligible for that, so
-# currently we store the library in ${PATCHDIR} and extract it before running
-# CMake.
-pre-configure:
-	cd ${WRKSRC}/src/foreign && ${SH} ${PATCHDIR}/tclap-1.2.1-headers.shar
-
 # workaround a bug in cmake (?). Without this we get an error like:
 # cd /usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1/base_wx && /usr/bin/c++   -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -D_THREAD_SAFE -O2 -fno-strict-aliasing -pipe -pthread;-D_THREAD_SAFE -O3 -DNDEBUG -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin_base -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/foreign -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/foreign/vigra -I/usr/local/include -I/usr/local/include/OpenEXR -isystem /usr/local/lib/wx/include/gtk2-ansi-release-2.8 -isystem /usr/local/include/wx-2.8 -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1 -o CMakeFiles/huginbasewx.dir/ImageCache.o -c /usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1/base_wx/ImageCache.cpp
 # c++: No input files specified

Modified: head/graphics/hugin/distinfo
==============================================================================
--- head/graphics/hugin/distinfo	Sun Feb 17 16:47:06 2013	(r312428)
+++ head/graphics/hugin/distinfo	Sun Feb 17 17:12:59 2013	(r312429)
@@ -1,2 +1,2 @@
-SHA256 (hugin-2011.4.0.tar.bz2) = 2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
-SIZE (hugin-2011.4.0.tar.bz2) = 11740410
+SHA256 (hugin-2012.0.0.tar.bz2) = 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3
+SIZE (hugin-2012.0.0.tar.bz2) = 11658665

Modified: head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h
==============================================================================
--- head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h	Sun Feb 17 16:47:06 2013	(r312428)
+++ head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h	Sun Feb 17 17:12:59 2013	(r312429)
@@ -2,29 +2,10 @@
 +++ 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));
- 
-   }