opencv-contrib-face: clean up

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Feb 7 22:35:26 2025 +0100
Changeset:	f248e55486becb20103778bad0e675b06a18d5f1

Modified Files:
	opencv-contrib-face/Makefile

Log Message:
opencv-contrib-face: clean up

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f248e55486becb20103778bad0e675b06a18d5f1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 opencv-contrib-face/Makefile | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diffs:
diff --git a/opencv-contrib-face/Makefile b/opencv-contrib-face/Makefile
index deadb1082d..5de48e816b 100644
--- a/opencv-contrib-face/Makefile
+++ b/opencv-contrib-face/Makefile
@@ -22,9 +22,9 @@ WRKSRC=		${WRKDIR}/opencv-${PKGVERSION_NOREV}
 post-extract:
 	${CP} ${WRKDIR}/opencv-${PKGVERSION_NOREV}_face_landmark_model.dat ${WRKDIR}/opencv_contrib-${PKGVERSION_NOREV}/modules/face/face_landmark_model.dat
 
-CMAKE_CONFIGURE_ARGS+=	-DBUILD_DOCS=OFF
-CMAKE_CONFIGURE_ARGS+=	-DWITH_FFMPEG=OFF
-CMAKE_CONFIGURE_ARGS+=	-DWITH_JASPER=OFF
+CMAKE_CONFIGURE_ARGS+=		-DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+=		-DWITH_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+=		-DWITH_JASPER=OFF
 
 CMAKE_CONFIGURE_ARGS+=		-DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
 CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_adas=OFF
@@ -74,27 +74,20 @@ CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_ts=OFF
 CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_videoio=OFF
 CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_videostab=OFF
 
+# needed by face
+CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_objdetect=ON
+# needed by objdetect
+CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_calib3d=ON
 # needed by calib3d
 CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_features2d=ON
+CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_flann=ON
 CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_imgproc=ON
 # needed by flann and objdetect
 CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_core=ON
-# flann needed by calib3d
-CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_flann=ON
-# calib3d needed by objdetect
-CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_calib3d=ON
-# objdetect needed by face
-CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_objdetect=ON
+
 # needed by tracking
 CMAKE_CONFIGURE_ARGS+=		-DBUILD_opencv_video=ON
 
-# direct patch difficult due to partial merge with opencv package
-SUBST_CLASSES+=		stereo
-SUBST_FILES.stereo+=	../opencv_contrib-${PKGVERSION_NOREV}/modules/stereo/CMakeLists.txt
-SUBST_SED.stereo+=	-e "s/ocv_define_module(stereo/ocv_define_module(stereo opencv_calib3d/"
-SUBST_STAGE.stereo=	pre-configure
-SUBST_MESSAGE.stereo=	Add missing library dependency.
-
 BUILDLINK_API_DEPENDS.opencv+=	opencv>=${PKGVERSION_NOREV}
 .include "../../wip/opencv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"