From 220df8252d19e00a652ac7d337b2ab931eea4b5d Mon Sep 17 00:00:00 2001
From: Chris Ballinger <cballinger@rightpoint.com>
Date: Thu, 14 May 2020 12:48:37 -0700
Subject: [PATCH] Add target conditionals for Mac Catalyst

---
 modules/videoio/src/cap_avfoundation.mm        | 2 +-
 modules/videoio/src/cap_ios_abstract_camera.mm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/videoio/src/cap_avfoundation.mm b/modules/videoio/src/cap_avfoundation.mm
index 9d4fc66..6592341 100644
--- a/modules/videoio/src/cap_avfoundation.mm
+++ b/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
 
diff --git a/modules/videoio/src/cap_ios_abstract_camera.mm b/modules/videoio/src/cap_ios_abstract_camera.mm
index 032ab85..1f69842 100644
--- a/modules/videoio/src/cap_ios_abstract_camera.mm
+++ b/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) {
-- 
2.7.4