Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jun 2015 18:26:46 +0000 (UTC)
From:      Alberto Villa <avilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r390659 - branches/2015Q2/graphics/opencv
Message-ID:  <201506261826.t5QIQk09089690@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avilla
Date: Fri Jun 26 18:26:45 2015
New Revision: 390659
URL: https://svnweb.freebsd.org/changeset/ports/390659

Log:
  MFH: r390539
  
  graphics/opencv: fix configure when EIGEN is off
  
  When EIGEN option is off, CMAKE_ARGS is reset, thus enabling build of
  tests and docs (causing some leftovers), and, should it be installed,
  linking against libdc1394 even when option DC1394 is off. PORTREVISION
  bump is needed to address the latter case.
  
  Meanwhile, re-enable make jobs.
  
  Differential Revision:	https://reviews.freebsd.org/D2893
  Reviewed by:	jhale (maintainer)
  Approved by:	jhale (maintainer)
  Approved by:	portmgr

Modified:
  branches/2015Q2/graphics/opencv/Makefile
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/graphics/opencv/Makefile
==============================================================================
--- branches/2015Q2/graphics/opencv/Makefile	Fri Jun 26 18:21:45 2015	(r390658)
+++ branches/2015Q2/graphics/opencv/Makefile	Fri Jun 26 18:26:45 2015	(r390659)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	opencv
 PORTVERSION=	2.4.9
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
 
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		cmake pkgconfig zip
 USE_LDCONFIG=	yes
 WANT_GSTREAMER=	yes
-MAKE_JOBS_UNSAFE=	yes
 
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON_sparc64=	does not compile on sparc64
@@ -76,7 +75,7 @@ CMAKE_ARGS+=	-DWITH_1394:BOOL=Off
 BUILD_DEPENDS+=	${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3
 CMAKE_ARGS+=	-DWITH_EIGEN:BOOL=On
 .else
-CMAKE_ARGS=	-DWITH_EIGEN:BOOL=Off
+CMAKE_ARGS+=	-DWITH_EIGEN:BOOL=Off
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506261826.t5QIQk09089690>