From 5e4cc57d9ca6545f2773a7502749d541ba4d86bd Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 2 Mar 2021 08:10:23 +0000 Subject: [PATCH] have opencv generate a pc file, 'cause some software (gmic) is looking for that. no obvious fallout in a bulk (saw the remaining -fno-common stuff, but nothing seemed to pick it up). okay rsadowski@ --- graphics/opencv/Makefile | 8 +++++--- graphics/opencv/pkg/PLIST-main | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 56d7abe9d7f..2407dcbe0d0 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.67 2021/02/23 19:39:26 sthen Exp $ +# $OpenBSD: Makefile,v 1.68 2021/03/02 08:10:23 espie Exp $ ONLY_FOR_ARCHS-java = aarch64 amd64 i386 @@ -10,7 +10,7 @@ V = 4.5.1 GH_ACCOUNT = opencv GH_PROJECT = opencv GH_TAGNAME = ${V} -REVISION = 1 +REVISION = 2 PKGNAME-main = opencv-${V} PKGNAME-java = opencv-java-${V} @@ -101,7 +101,9 @@ CONFIGURE_ARGS = -DBUILD_DOCS=OFF \ -DWITH_IPP=OFF \ -DWITH_OPENCL=OFF \ -DWITH_V4L=OFF \ - -DWITH_VTK=OFF + -DWITH_VTK=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON + .include diff --git a/graphics/opencv/pkg/PLIST-main b/graphics/opencv/pkg/PLIST-main index 7247ba60e67..eb0a205aaae 100644 --- a/graphics/opencv/pkg/PLIST-main +++ b/graphics/opencv/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.16 2021/01/04 14:06:32 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.17 2021/03/02 08:10:23 espie Exp $ @bin bin/opencv_annotation @bin bin/opencv_interactive-calibration @bin bin/opencv_version @@ -284,6 +284,7 @@ lib/cmake/opencv4/OpenCVModules.cmake @lib lib/libopencv_stitching.so.${LIBopencv_stitching_VERSION} @lib lib/libopencv_video.so.${LIBopencv_video_VERSION} @lib lib/libopencv_videoio.so.${LIBopencv_videoio_VERSION} +lib/pkgconfig/opencv4.pc lib/python${MODPY_VERSION}/site-packages/cv2/ lib/python${MODPY_VERSION}/site-packages/cv2/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cv2/${MODPY_PYCACHE}/