Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jun 2015 08:36:43 +0000 (UTC)
From:      Alberto Villa <avilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390539 - head/graphics/opencv
Message-ID:  <201506250836.t5P8ahth032138@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avilla
Date: Thu Jun 25 08:36:42 2015
New Revision: 390539
URL: https://svnweb.freebsd.org/changeset/ports/390539

Log:
  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)
  MFH:		2015Q2

Modified:
  head/graphics/opencv/Makefile

Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile	Thu Jun 25 08:14:42 2015	(r390538)
+++ head/graphics/opencv/Makefile	Thu Jun 25 08:36:42 2015	(r390539)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	opencv
 PORTVERSION=	2.4.9
-PORTREVISION?=	5
+PORTREVISION?=	6
 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?201506250836.t5P8ahth032138>