diff --git a/media-libs/opencv/opencv-3.4.3.recipe b/media-libs/opencv/opencv-3.4.3.recipe index 40dfc9f73..a172dc220 100644 --- a/media-libs/opencv/opencv-3.4.3.recipe +++ b/media-libs/opencv/opencv-3.4.3.recipe @@ -9,10 +9,13 @@ COPYRIGHT="2000-2016, Intel Corporation 2015-2016, OpenCV Foundation 2015-2016, Itseez Inc." LICENSE="BSD (3-clause)" -REVISION="1" +REVISION="2" 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" ARCHITECTURES="?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" @@ -29,23 +32,53 @@ libVersionCompat="$libVersion compat >= ${libVersion%.*}" PROVIDES=" opencv$secondaryArchSuffix = $portVersionCompat + lib:libopencv_aruco$secondaryArchSuffix = $libVersionCompat + lib:libopencv_bgsegm$secondaryArchSuffix = $libVersionCompat + lib:libopencv_bioinspired$secondaryArchSuffix = $libVersionCompat 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 @@ -53,6 +86,7 @@ REQUIRES=" lib:libavformat$secondaryArchSuffix lib:libavresample$secondaryArchSuffix lib:libavutil$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix lib:libgdal$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix @@ -61,6 +95,8 @@ REQUIRES=" 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 @@ -81,23 +117,53 @@ REQUIRES=" 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 @@ -110,6 +176,7 @@ PROVIDES_tools=" cmd:opencv_traincascade$commandSuffix = $portVersion cmd:opencv_version$commandSuffix = $portVersion cmd:opencv_visualisation$commandSuffix = $portVersion + cmd:opencv_waldboost_detector$commandSuffix = $portVersion " REQUIRES_tools=" haiku$secondaryArchSuffix @@ -124,15 +191,21 @@ BUILD_REQUIRES=" devel:libavformat$secondaryArchSuffix devel:libavresample$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 @@ -142,12 +215,14 @@ BUILD_REQUIRES=" devel:libopencl_headers$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 @@ -207,9 +282,11 @@ BUILD() -DCMAKE_SKIP_RPATH=ON \ -DENABLE_PIC=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ + -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" + -DOpenBLAS_LIB="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/lib/$ARCH_SUBDIR" \ + -DOPENCV_EXTRA_MODULES_PATH="$sourceDir2/opencv_contrib-$portVersion/modules" make $jobArgs } @@ -228,23 +305,53 @@ INSTALL() mkdir -p $libDir/cmake/OpenCV mv $dataDir/OpenCV/*.cmake $libDir/cmake/OpenCV/ - prepareInstalledDevelLibs libopencv_calib3d \ + prepareInstalledDevelLibs libopencv_aruco \ + libopencv_bgsegm \ + libopencv_bioinspired \ + libopencv_calib3d \ + libopencv_ccalib \ 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_videostab \ + libopencv_xfeatures2d \ + libopencv_ximgproc \ + libopencv_xobjdetect \ + libopencv_xphoto # Cleanup # fixPkgconfig don't know about this variables