Merge pull request #1613 from Teleprompter-llc/fix/mac-catalyst-target

Fix: build issue where mac catalyst target had AVCaptureSession extension redeclaration
shogo4405 · Oct 31, 2024 · 4d19072 · 4d19072
2 parents 2f07d2d + 980c3c6
commit 4d19072
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/Sources/Extension/AVCaptureSession+Extension.swift b/Sources/Extension/AVCaptureSession+Extension.swift
@@ -17,7 +17,7 @@ extension AVCaptureSession {
         }
     }
 }
-#endif
+#else
 
 @available(tvOS 17.0, *)
 extension AVCaptureSession {
@@ -36,4 +36,5 @@ extension AVCaptureSession {
         }
     }
 }
+#endif
 // swiftlint:enable unused_setter_value
diff --git a/Sources/Mixer/AudioMixerByMultiTrack.swift b/Sources/Mixer/AudioMixerByMultiTrack.swift
@@ -1,5 +1,6 @@
 import AVFoundation
 import Foundation
+import CoreAudio
 
 final class AudioMixerByMultiTrack: AudioMixer {
     private static let defaultSampleTime: AVAudioFramePosition = 0

diff --git a/Sources/Mixer/AudioMonitor.swift b/Sources/Mixer/AudioMonitor.swift
@@ -2,6 +2,7 @@ import AudioUnit
 import AVFoundation
 import CoreMedia
 import Foundation
+import CoreAudio
 
 final class AudioMonitor {
     var inputFormat: AVAudioFormat? {

diff --git a/Sources/Mixer/AudioRingBuffer.swift b/Sources/Mixer/AudioRingBuffer.swift
@@ -2,6 +2,7 @@ import Accelerate
 import AVFoundation
 import CoreMedia
 import Foundation
+import CoreAudio
 
 final class AudioRingBuffer {
     private static let bufferCounts: UInt32 = 16

diff --git a/Sources/RTMP/RTMPStream.swift b/Sources/RTMP/RTMPStream.swift
@@ -7,7 +7,7 @@ import UIKit
 typealias View = UIView
 #endif
 
-#if canImport(AppKit)
+#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 import AppKit
 typealias View = NSView
 #endif

diff --git a/Sources/Screen/Shape.swift b/Sources/Screen/Shape.swift
@@ -26,7 +26,7 @@ final class RoundedSquareShape: Shape {
             return nil
         }
         let path = CGPath(roundedRect: rect, cornerWidth: cornerRadius, cornerHeight: cornerRadius, transform: nil)
-        #if canImport(AppKit)
+        #if canImport(AppKit) && !targetEnvironment(macCatalyst)
         context.setFillColor(NSColor.white.cgColor)
         #endif
         #if canImport(UIKit)