[134472] trunk/dports/graphics/opencv/Portfile
stromnov at macports.org
stromnov at macports.org
Thu Mar 26 14:13:20 PDT 2015
Revision: 134472
https://trac.macports.org/changeset/134472
Author: stromnov at macports.org
Date: 2015-03-26 14:13:20 -0700 (Thu, 26 Mar 2015)
Log Message:
-----------
opencv: apply patch for out-of-source build from #47256
Modified Paths:
--------------
trunk/dports/graphics/opencv/Portfile
Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile 2015-03-26 20:50:37 UTC (rev 134471)
+++ trunk/dports/graphics/opencv/Portfile 2015-03-26 21:13:20 UTC (rev 134472)
@@ -27,13 +27,6 @@
homepage http://opencv.org
master_sites sourceforge:project/opencvlibrary/opencv-unix/${version}
-worksrcdir ${worksrcdir}/../build
-patch.dir ${workpath}/${distname}
-
-post-extract {
- file mkdir ${worksrcpath}
-}
-
use_zip yes
checksums rmd160 793391b05b571859005b98612cb176c02352a94f \
@@ -59,7 +52,9 @@
patch-modules_core_src_parallel.cpp.diff \
patch-modules-highgui-src-window_cocoa.mm.diff
-configure.args-append ../${distname}/ \
+cmake.out_of_source yes
+
+configure.args-append \
-DWITH_1394=OFF \
-DWITH_CARBON=OFF \
-DWITH_CUBLAS=OFF \
@@ -134,7 +129,7 @@
# TODO: Actually fix this
if {[string match "*clang*" ${configure.compiler}]} {
post-patch {
- reinplace "/-Werror=sequence-point/d" ${worksrcpath}/../${distname}/cmake/OpenCVCompilerOptions.cmake
+ reinplace "/-Werror=sequence-point/d" ${worksrcpath}/cmake/OpenCVCompilerOptions.cmake
}
}
@@ -174,7 +169,7 @@
configure.args-append -DWITH_OPENNI=ON
post-patch {
- reinplace "s,@@PREFIX@@,${prefix},g" ${worksrcpath}/../${distname}/cmake/OpenCVFindOpenNI.cmake
+ reinplace "s,@@PREFIX@@,${prefix},g" ${worksrcpath}/cmake/OpenCVFindOpenNI.cmake
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150326/d77dc6f9/attachment.html>
More information about the macports-changes
mailing list