OpenCV 4.5.0 (#5273)

OpenCV: bump, deprecating the old recipe
2026-05-06 06:58:57 +02:00 · 2020-11-16 21:22:53 +01:00
parent 756019e291
commit bfb1299e7f
2 changed files with 293 additions and 163 deletions
--- a/media-libs/opencv/opencv-4.5.0.recipe
+++ b/media-libs/opencv/opencv-4.5.0.recipe
@@ -0,0 +1,280 @@
+SUMMARY="Open Source Computer Vision Library"
+DESCRIPTION="A collection of algorithms and sample code for various \
+computer vision problems."
+HOMEPAGE="https://opencv.org/"
+COPYRIGHT="2000-2020, Intel Corporation
+	2009-2011, Willow Garage Inc.
+	2009-2016, NVIDIA Corporation
+	2010-2013, Advanced Micro Devices, Inc.
+	2015-2016, OpenCV Foundation
+	2015-2016, Itseez Inc.
+	2019-2020, Xperience AI"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
+SOURCE_FILENAME="opencv-$portVersion.tar.gz"
+CHECKSUM_SHA256="dde4bf8d6639a5d3fe34d5515eab4a15669ded609a1d622350c7ff20dace1907"
+SOURCE_DIR="opencv-$portVersion"
+
+ARCHITECTURES="?x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+fi
+
+portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
+PROVIDES="
+	opencv$secondaryArchSuffix = $portVersionCompat
+	lib:libopencv_calib3d$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_core$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_dnn$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_features2d$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_flann$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_gapi$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_highgui$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_imgcodecs$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_imgproc$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_ml$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_objdetect$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_photo$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_stitching$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_video$secondaryArchSuffix = $libVersionCompat
+	lib:libopencv_videoio$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix
+	lib:libavformat$secondaryArchSuffix
+	lib:libavutil$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libgdal$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libGLU$secondaryArchSuffix
+	lib:libgphoto2$secondaryArchSuffix
+	lib:libgstapp_1.0$secondaryArchSuffix
+	lib:libgstreamer_1.0$secondaryArchSuffix
+	lib:libgstvideo_1.0$secondaryArchSuffix
+	lib:libharfbuzz$secondaryArchSuffix
+	lib:libhdf5$secondaryArchSuffix
+#	lib:libilmimf$secondaryArchSuffix #openexr
+	lib:libintl$secondaryArchSuffix
+	lib:libjasper$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:liblapack$secondaryArchSuffix
+	lib:libopenblas$secondaryArchSuffix
+	lib:libopenjp2$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libQt5Concurrent$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Test$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libswscale$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libwebp$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	opencv${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libopencv_calib3d$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_core$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_dnn$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_features2d$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_flann$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_gapi$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_highgui$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_imgcodecs$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_imgproc$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_ml$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_objdetect$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_photo$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_stitching$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_video$secondaryArchSuffix = $libVersionCompat
+	devel:libopencv_videoio$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	opencv$secondaryArchSuffix == $portVersion base
+	"
+
+PROVIDES_tools="
+	opencv${secondaryArchSuffix}_tools = $portVersionCompat
+	cmd:opencv_annotation$commandSuffix = $portVersion
+	cmd:opencv_interactive_calibration$commandSuffix = $portVersion
+	cmd:opencv_version$commandSuffix = $portVersion
+	cmd:opencv_visualisation$commandSuffix = $portVersion
+	cmd:setup_vars_opencv4.sh$commandSuffix = $portVersion
+	"
+REQUIRES_tools="
+	haiku$secondaryArchSuffix
+	opencv$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:cblas$secondaryArchSuffix
+	devel:eigen$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	devel:libavformat$secondaryArchSuffix
+	devel:libavutil$secondaryArchSuffix
+#	devel:libcaffe$secondaryArchSuffix
+	devel:libexif$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libgdal$secondaryArchSuffix
+#	devel:libgflags$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
+	devel:libglib_2.0$secondaryArchSuffix
+#	devel:libglog$secondaryArchSuffix
+	devel:libGLU$secondaryArchSuffix
+	devel:libgphoto2$secondaryArchSuffix
+	devel:libgstapp_1.0$secondaryArchSuffix
+	devel:libgstreamer_1.0$secondaryArchSuffix
+	devel:libgstvideo_1.0$secondaryArchSuffix
+	devel:libharfbuzz$secondaryArchSuffix
+	devel:libhdf5$secondaryArchSuffix
+#	devel:libilmimf$secondaryArchSuffix #openexr
+	devel:libintl$secondaryArchSuffix
+	devel:libjasper$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:liblapack$secondaryArchSuffix
+	devel:liblept$secondaryArchSuffix
+	devel:libopenblas$secondaryArchSuffix
+	devel:libopencl_headers$secondaryArchSuffix
+	devel:libopenjp2$secondaryArchSuffix
+	devel:liborc_0.4$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+#	devel:libprotobuf$secondaryArchSuffix
+	devel:libQt5Concurrent$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Test$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libswscale$secondaryArchSuffix
+	devel:libtesseract$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+#	cmd:ant
+	cmd:cmake
+	cmd:doxygen
+	cmd:f2py2
+	cmd:f2py3
+	cmd:gcc$secondaryArchSuffix
+#	cmd:javac
+#	cmd:jni
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+#	cmd:matlab # maybe later
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:python2
+	cmd:python3
+	"
+
+defineDebugInfoPackage opencv$secondaryArchSuffix \
+	$libDir/libopencv_calib3d.so.$libVersion \
+	$libDir/libopencv_core.so.$libVersion \
+	$libDir/libopencv_dnn.so.$libVersion \
+	$libDir/libopencv_features2d.so.$libVersion \
+	$libDir/libopencv_flann.so.$libVersion \
+	$libDir/libopencv_gapi.so.$libVersion \
+	$libDir/libopencv_highgui.so.$libVersion \
+	$libDir/libopencv_imgcodecs.so.$libVersion \
+	$libDir/libopencv_imgproc.so.$libVersion \
+	$libDir/libopencv_ml.so.$libVersion \
+	$libDir/libopencv_objdetect.so.$libVersion \
+	$libDir/libopencv_photo.so.$libVersion \
+	$libDir/libopencv_stitching.so.$libVersion \
+	$libDir/libopencv_video.so.$libVersion \
+	$libDir/libopencv_videoio.so.$libVersion
+
+BUILD()
+{
+	mkdir -p build_haiku && cd build_haiku
+
+	local ARCH_SUBDIR=
+	if [ -n "$secondaryArchSuffix" ]; then
+		ARCH_SUBDIR="$secondaryArchSuffix/"
+	fi
+
+	cmake .. \
+		-DWITH_GDAL=ON \
+		-DWITH_IPP=OFF \
+		-DWITH_OPENGL=OFF \
+		-DWITH_QT=ON \
+		-DWITH_EIGEN=ON \
+		-DWITH_OPENEXR=ON \
+		-DWITH_FFMPEG=ON \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DENABLE_PIC=OFF \
+		-D OPENCV_GENERATE_PKGCONFIG=YES \
+		-DCMAKE_INSTALL_PREFIX:PATH="$prefix" \
+		-DOPENCV_OTHER_INSTALL_PATH:PATH="$dataDir" \
+		-DOpenBLAS_INCLUDE_DIR="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/headers/$ARCH_SUBDIR" \
+		-DOpenBLAS_LIB="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/lib/$ARCH_SUBDIR"
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build_haiku
+
+	make install
+
+	mkdir -p $developDir $dataDir
+	mv $prefix/include $includeDir
+	mv $prefix/share/* $dataDir
+	rmdir $prefix/share
+
+	prepareInstalledDevelLibs libopencv_calib3d \
+		libopencv_core \
+		libopencv_dnn \
+		libopencv_features2d \
+		libopencv_flann \
+		libopencv_gapi \
+		libopencv_highgui \
+		libopencv_imgcodecs \
+		libopencv_imgproc \
+		libopencv_ml \
+		libopencv_objdetect \
+		libopencv_photo \
+		libopencv_stitching \
+		libopencv_video \
+		libopencv_videoio
+
+	# fixCmake
+	sed -i 's,\/include,/'${relativeIncludeDir}',g' \
+		$libDir/cmake/opencv4/OpenCVConfig.cmake
+
+	fixPkgconfig
+
+	# fixPkgconfig
+	sed -i 's,\/headers,\/headers/opencv4,g' \
+		$prefix/$relativeDevelopLibDir/pkgconfig/opencv4.pc
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+
+	# tools package
+	packageEntries tools \
+		$binDir
+}
+
+TEST()
+{
+	LIBRARY_PATH="$sourceDir/build_haiku/lib${LIBRARY_PATH:+:$LIBRARY_PATH}" \
+	make -C build_haiku test $jobArgs
+}
--- a/media-libs/opencv/opencv3-3.4.3.recipe
+++ b/media-libs/opencv/opencv3-3.4.3.recipe
@@ -9,13 +9,11 @@ COPYRIGHT="2000-2016, Intel Corporation
 	2015-2016, OpenCV Foundation
 	2015-2016, Itseez Inc."
 LICENSE="BSD (3-clause)"
-REVISION="11"
+REVISION="12"
 SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="opencv-$portVersion.tar.gz"
 CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec"
-SOURCE_URI_2="https://github.com/opencv/opencv_contrib/archive/$portVersion.tar.gz"
-SOURCE_FILENAME_2="opencv_contrib-$portVersion.tar.gz"
-CHECKSUM_SHA256_2="6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636"
+SOURCE_DIR="opencv-$portVersion"

 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -33,54 +31,24 @@ libVersionCompat="$libVersion compat >= ${libVersion%.*}"
 pythonVersion="3.7"

 PROVIDES="
-	opencv$secondaryArchSuffix = $portVersionCompat
-	lib:libopencv_aruco$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_bgsegm$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_bioinspired$secondaryArchSuffix = $libVersionCompat
+	opencv3$secondaryArchSuffix = $portVersionCompat
 	lib:libopencv_calib3d$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_ccalib$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_core$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_cvv$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_datasets$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_dnn_objdetect$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_dnn$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_dpm$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_face$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_features2d$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_flann$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_freetype$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_fuzzy$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_hdf$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_hfs$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_highgui$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_img_hash$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_imgcodecs$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_imgproc$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_line_descriptor$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_ml$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_objdetect$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_optflow$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_phase_unwrapping$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_photo$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_plot$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_reg$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_rgbd$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_saliency$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_shape$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_stereo$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_stitching$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_structured_light$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_superres$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_surface_matching$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_text$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_tracking$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_video$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_videoio$secondaryArchSuffix = $libVersionCompat
 	lib:libopencv_videostab$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_xfeatures2d$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_ximgproc$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_xobjdetect$secondaryArchSuffix = $libVersionCompat
-	lib:libopencv_xphoto$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -121,61 +89,8 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"

-PROVIDES_devel="
-	opencv${secondaryArchSuffix}_devel = $portVersionCompat
-	devel:libopencv_aruco$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_bgsegm$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_bioinspired$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_calib3d$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_ccalib$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_core$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_cvv$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_datasets$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_dnn_objdetect$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_dnn$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_dpm$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_face$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_features2d$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_flann$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_freetype$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_fuzzy$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_hdf$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_hfs$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_highgui$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_img_hash$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_imgcodecs$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_imgproc$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_line_descriptor$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_ml$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_objdetect$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_optflow$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_phase_unwrapping$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_photo$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_plot$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_reg$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_rgbd$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_saliency$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_shape$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_stereo$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_stitching$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_structured_light$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_superres$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_surface_matching$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_text$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_tracking$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_video$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_videoio$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_videostab$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_xfeatures2d$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_ximgproc$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_xobjdetect$secondaryArchSuffix = $libVersionCompat
-	devel:libopencv_xphoto$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES_devel="
-	opencv$secondaryArchSuffix == $portVersion base
-	"
-
 PROVIDES_tools="
+	opencv3${secondaryArchSuffix}_tools = $portVersionCompat
 	cmd:opencv_annotation$commandSuffix = $portVersion
 	cmd:opencv_createsamples$commandSuffix = $portVersion
 	cmd:opencv_interactive_calibration$commandSuffix = $portVersion
@@ -186,7 +101,7 @@ PROVIDES_tools="
 	"
 REQUIRES_tools="
 	haiku$secondaryArchSuffix
-	opencv$secondaryArchSuffix == $portVersion base
+	opencv3$secondaryArchSuffix == $portVersion base
 	"

 BUILD_REQUIRES="
@@ -250,7 +165,7 @@ BUILD_PREREQUIRES="
 	cmd:python${pythonVersion}
 	"

-defineDebugInfoPackage opencv$secondaryArchSuffix \
+defineDebugInfoPackage opencv3$secondaryArchSuffix \
 	$libDir/libopencv_calib3d.so.$libVersion \
 	$libDir/libopencv_core.so.$libVersion \
 	$libDir/libopencv_dnn.so.$libVersion \
@@ -291,8 +206,7 @@ BUILD()
 		-DCMAKE_INSTALL_PREFIX:PATH="$prefix" \
 		-DOPENCV_OTHER_INSTALL_PATH:PATH="$dataDir" \
 		-DOpenBLAS_INCLUDE_DIR="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/headers/$ARCH_SUBDIR" \
-		-DOpenBLAS_LIB="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/lib/$ARCH_SUBDIR" \
-		-DOPENCV_EXTRA_MODULES_PATH="$sourceDir2/opencv_contrib-$portVersion/modules"
+		-DOpenBLAS_LIB="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/lib/$ARCH_SUBDIR"

 	export DISABLE_ASLR=1

@@ -305,99 +219,35 @@ INSTALL()

 	make install

-	mkdir -p $developDir $dataDir $includeDir
-	mv $prefix/include/* $includeDir
-	mv $prefix/share/* $dataDir
-	rmdir $prefix/{share,include}
-
-	mkdir -p $libDir/cmake/OpenCV
-	mv $dataDir/OpenCV/*.cmake $libDir/cmake/OpenCV/
-
 	if [ -n "$secondaryArchSuffix" ]; then
 		mv $prefix/lib/*.so* $libDir
-		mv $prefix/lib/pkgconfig $libDir
 		mv $prefix/lib/python* $libDir
 	fi

-	prepareInstalledDevelLibs libopencv_aruco \
-		libopencv_bgsegm \
-		libopencv_bioinspired \
-		libopencv_calib3d \
-		libopencv_ccalib \
+	prepareInstalledDevelLibs libopencv_calib3d \
 		libopencv_core \
-		libopencv_cvv \
-		libopencv_datasets \
-		libopencv_dnn_objdetect \
 		libopencv_dnn \
-		libopencv_dpm \
-		libopencv_face \
 		libopencv_features2d \
 		libopencv_flann \
-		libopencv_freetype \
-		libopencv_fuzzy \
-		libopencv_hdf \
-		libopencv_hfs \
 		libopencv_highgui \
-		libopencv_img_hash \
 		libopencv_imgcodecs \
 		libopencv_imgproc \
-		libopencv_line_descriptor \
 		libopencv_ml \
 		libopencv_objdetect \
-		libopencv_optflow \
-		libopencv_phase_unwrapping \
 		libopencv_photo \
-		libopencv_plot \
-		libopencv_reg \
-		libopencv_rgbd \
-		libopencv_saliency \
 		libopencv_shape \
-		libopencv_stereo \
 		libopencv_stitching \
-		libopencv_structured_light \
 		libopencv_superres \
-		libopencv_surface_matching \
-		libopencv_text \
-		libopencv_tracking \
 		libopencv_video \
 		libopencv_videoio \
-		libopencv_videostab \
-		libopencv_xfeatures2d \
-		libopencv_ximgproc \
-		libopencv_xobjdetect \
-		libopencv_xphoto
+		libopencv_videostab

-	# Cleanup
-	# fixPkgconfig don't know about this variables
-	sed -i 's,^includedir_old=\(.*\),includedir_old=${prefix}/'${relativeIncludeDir}'/opencv,' \
-		$libDir/pkgconfig/opencv.pc
-	sed -i 's,^includedir_new=\(.*\),includedir_new=${prefix}/'${relativeIncludeDir}',' \
-		$libDir/pkgconfig/opencv.pc
-
-	fixPkgconfig
-
-	# fixCmake
-	sed -i 's,\/include,/'${relativeIncludeDir}',g' \
-		$libDir/cmake/OpenCV/OpenCVConfig.cmake
-	sed -i 's|set(OpenCV_INCLUDE_DIRS.*|set(OpenCV_INCLUDE_DIRS "'${includeDir}'" "'${includeDir}'/opencv")|g' \
-		$libDir/cmake/OpenCV/OpenCVConfig.cmake
-	sed -i 's|/\.\./\.\./|&../|g' \
-		$libDir/cmake/OpenCV/OpenCVConfig.cmake
-	sed -i 's,\/lib\/,\/,g' \
-		$libDir/cmake/OpenCV/OpenCVModules-release.cmake
-
-	# devel package
-	packageEntries devel \
-		$developDir \
-		$libDir/cmake
+	rm -rf $prefix/{share,include}
+	rm -rf $dataDir/OpenCV
+	rm -rf $prefix/lib/pkgconfig
+	rm -rf $libDir/cmake $developDir

 	# tools package
 	packageEntries tools \
 		$prefix/bin
 }
-
-TEST()
-{
-	LIBRARY_PATH="$sourceDir/build_haiku/lib${LIBRARY_PATH:+:$LIBRARY_PATH}" \
-	make -C build_haiku test $jobArgs
-}