Merge pull request #17304 from chrisballinger:maccatalyst

modules/imgcodecs/CMakeLists.txt

@@ -105,7 +105,7 @@ file(GLOB imgcodecs_ext_hdrs
 
 if(IOS)
   list(APPEND imgcodecs_srcs ${CMAKE_CURRENT_LIST_DIR}/src/ios_conversions.mm)
-  list(APPEND IMGCODECS_LIBRARIES "-framework Accelerate" "-framework CoreGraphics" "-framework QuartzCore" "-framework AssetsLibrary")
+  list(APPEND IMGCODECS_LIBRARIES "-framework Accelerate" "-framework CoreGraphics" "-framework QuartzCore")
 endif()
 if(APPLE_FRAMEWORK)
   list(APPEND IMGCODECS_LIBRARIES "-framework UIKit")

modules/videoio/src/cap_avfoundation.mm

@@ -383,7 +383,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
         [mCaptureDecompressedVideoOutput setVideoSettings:pixelBufferOptions];
         mCaptureDecompressedVideoOutput.alwaysDiscardsLateVideoFrames = YES;
 
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+#if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_MACCATALYST
         mCaptureDecompressedVideoOutput.minFrameDuration = CMTimeMake(1, 30);
 #endif
 

modules/videoio/src/cap_ios_abstract_camera.mm

@@ -299,11 +299,13 @@
     }
     else
     {
+#if !TARGET_OS_MACCATALYST
         // Deprecated in 6.0; here for backward compatibility
         if ([self.captureVideoPreviewLayer isOrientationSupported])
         {
             [self.captureVideoPreviewLayer setOrientation:self.defaultAVCaptureVideoOrientation];
         }
+#endif
     }
 
     if (parentView != nil) {