Fixed FastCV module dependencies and CI in 5.x

Author: asmorkalov

.github/workflows/PR-5.x.yaml

@@ -15,7 +15,7 @@ jobs:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml@main
 
   Ubuntu2004-ARM64-FastCV:
-    uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-ARM64-FastCV.yaml@main
+    uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-5.x-ARM64-FastCV.yaml@main
 
   Ubuntu2004-x64-CUDA:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml@main

modules/fastcv/CMakeLists.txt

@@ -1,6 +1,7 @@
+message(STATUS "HAVE_FASTCV status ${HAVE_FASTCV}")
 if(HAVE_FASTCV)
   set(the_description "Qualcomm FastCV accelerated functions")
-  ocv_define_module(fastcv opencv_core opencv_imgproc opencv_features2d opencv_video WRAP python java)
+  ocv_define_module(fastcv opencv_core opencv_imgproc opencv_features opencv_video WRAP python java)
   ocv_module_include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
     ${FastCV_INCLUDE_PATH})

modules/fastcv/perf/perf_precomp.hpp

@@ -7,7 +7,7 @@
 #define __FASTCV_EXT_PERF_PRECOMP_HPP__
 
 #include <opencv2/ts.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 #include <opencv2/fastcv.hpp>
 
 namespace opencv_test {

modules/fastcv/test/test_precomp.hpp

@@ -5,7 +5,7 @@
 
 #include <opencv2/ts.hpp>
 #include <opencv2/core/affine.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 #include <opencv2/video.hpp>
 
 #include <opencv2/fastcv.hpp>