diff options
| author | adam <adam@pkgsrc.org> | 2013-09-01 09:46:13 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-09-01 09:46:13 +0000 |
| commit | 88527141f8959e8c3ab5f9ec95b7d985ffad95ff (patch) | |
| tree | 4105ae7964c699bfb5ea4c7a5c01ff00cea445fb /graphics | |
| parent | 07c40cd04e3cbedfdfb5073bdb007612a3fadf86 (diff) | |
| download | pkgsrc-88527141f8959e8c3ab5f9ec95b7d985ffad95ff.tar.gz | |
Fix PLIST on Darwin, where OpenCL is enabled by default.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/opencv/Makefile | 13 | ||||
| -rw-r--r-- | graphics/opencv/PLIST | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 7de0195287b..dff0533558b 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2013/08/05 12:27:48 fhajny Exp $ +# $NetBSD: Makefile,v 1.42 2013/09/01 09:46:13 adam Exp $ DISTNAME= opencv-2.4.6.1 CATEGORIES= graphics devel @@ -35,13 +35,18 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* CXXFLAGS+= -std=c++11 .endif +PLIST_VARS+= opencl + +.if ${OPSYS} == "Darwin" +PLIST.opencl= yes +.else +.include "../../x11/gtk2/buildlink3.mk" +.endif + .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.if ${OPSYS} != "Darwin" -.include "../../x11/gtk2/buildlink3.mk" -.endif .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/opencv/PLIST b/graphics/opencv/PLIST index 0c2ab72ecdb..8b2c22a9933 100644 --- a/graphics/opencv/PLIST +++ b/graphics/opencv/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2013/08/08 12:18:49 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.13 2013/09/01 09:46:13 adam Exp $ bin/opencv_createsamples bin/opencv_haartraining bin/opencv_performance @@ -123,6 +123,8 @@ include/opencv2/nonfree/gpu.hpp include/opencv2/nonfree/nonfree.hpp include/opencv2/nonfree/ocl.hpp include/opencv2/objdetect/objdetect.hpp +${PLIST.opencl}include/opencv2/ocl/matrix_operations.hpp +${PLIST.opencl}include/opencv2/ocl/ocl.hpp include/opencv2/opencv.hpp include/opencv2/opencv_modules.hpp include/opencv2/photo/photo.hpp @@ -197,6 +199,9 @@ lib/libopencv_nonfree.so.2.4.6 lib/libopencv_objdetect.so lib/libopencv_objdetect.so.2.4 lib/libopencv_objdetect.so.2.4.6 +${PLIST.opencl}lib/libopencv_ocl.so +${PLIST.opencl}lib/libopencv_ocl.so.2.4 +${PLIST.opencl}lib/libopencv_ocl.so.2.4.6 lib/libopencv_photo.so lib/libopencv_photo.so.2.4 lib/libopencv_photo.so.2.4.6 |