Merge pull request #1660 from shogo4405/feature/update-libsrt

Bump to Haivision/srt up 1.5.4

.gitignore

@@ -21,13 +21,12 @@ Carthage/*
 .vscode/
 .swiftpm/
 
-HaishinKit.xcodeproj/project.xcworkspace/xcuserdata/shogo.xcuserdatad/WorkspaceSettings.xcsettings
 *.xcsettings
 docs/undocumented.json
 fastlane/report.xml
 docs/docsets/HaishinKit.docset/Contents/Resources/Documents/undocumented.json
-Vendor/SRT/OpenSSL/
-Vendor/SRT/srt/
-Vendor/SRT/Includes/
 HaishinKit.json
 SRTHaishinKit.json
+SRTHaishinKit/Vendor/SRT/OpenSSL/
+SRTHaishinKit/Vendor/SRT/srt/
+SRTHaishinKit/Vendor/SRT/Includes/

README.md

@@ -120,7 +120,7 @@ open Examples/Examples.xcodeproj
 |-|iOS|tvOS|macOS|visionOS|watchOS|
 |:----|:----:|:----:|:----:|:----:|:----:|
 |HaishinKit|13.0+|13.0+|10.15+|1.0+|-|
-|SRTHaishinKit|13.0+|13.0+|13.0+|1.0+|-|
+|SRTHaishinKit|13.0+|13.0+|10.15+|1.0+|-|
 
 ### Cocoa Keys
 Please contains Info.plist.

SRTHaishinKit.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.ios.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
   s.ios.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
 
-  # s.osx.deployment_target = "13.0"
+  # s.osx.deployment_target = "10.15"
   # s.osx.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=macosx*]' => 'x86_64' }
   # s.osx.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=macosx*]' => 'x86_64' }
 
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
 
   # s.visionos.deployment_target = "1.0"
 
-  s.source_files = "SRTHaishinKit/SRTHaishinKit.h", "HaishinKit/Sources/**/*.swift"
+  s.source_files = "SRTHaishinKit/SRTHaishinKit.h", "SRTHaishinKit/Sources/**/*.swift"
   s.vendored_frameworks = "SRTHaishinKit/Vendor/SRT/libsrt.xcframework"
   s.dependency 'HaishinKit', '2.0.2'
 

SRTHaishinKit/README.md

@@ -1,6 +1,10 @@
 # SRTHaishinKit
 - This module supports the SRT protocol. It is separated into its own module due to the large size of the wrapper library for libsrt.
 
+## libsrt.xcframework
+- This is a build of https://github.com/Haivision/srt as an xcframework.
+- The license under the MPLv2.0.
+
 ## 📓 Usage
 ### Ingest
 ```swift

SRTHaishinKit/Vendor/SRT/build-clone.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Copyright (c) shogo4405 and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD 3-Clause License found in the
+# LICENSE file in the root directory of this source tree.
+
 if which $(pwd)/OpenSSL >/dev/null; then
   echo ""
 else
@@ -11,7 +17,7 @@ if which $(pwd)/srt >/dev/null; then
 else
   git clone [email protected]:Haivision/srt.git
   pushd srt
-  git checkout refs/tags/v1.5.3
+  git checkout refs/tags/v1.5.4
   popd
 fi
 

SRTHaishinKit/Vendor/SRT/build-ios.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Copyright (c) shogo4405 and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD 3-Clause License found in the
+# LICENSE file in the root directory of this source tree.
+
 srt_ios() {
   IOS_OPENSSL=$(pwd)/OpenSSL/$1
 

SRTHaishinKit/Vendor/SRT/build-macos.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Copyright (c) shogo4405 and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD 3-Clause License found in the
+# LICENSE file in the root directory of this source tree.
+
 srt_macos() {
   MACOS_OPENSSL=$(pwd)/OpenSSL/$1
 
@@ -11,7 +17,7 @@ srt_macos() {
 }
 
 # macOS
-export MACOSX_DEPLOYMENT_TARGET=13.0
+export MACOSX_DEPLOYMENT_TARGET=10.15
 srt_macos macosx arm64
 libtool -static -o ./build/macosx/libsrt.a ./build/macosx/arm64/libsrt.a ./OpenSSL/macosx/lib/libcrypto.a ./OpenSSL/macosx/lib/libssl.a
 

SRTHaishinKit/Vendor/SRT/build-tvos.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Copyright (c) shogo4405 and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD 3-Clause License found in the
+# LICENSE file in the root directory of this source tree.
+
 srt_tvos() {
   OPENSSL=$(pwd)/OpenSSL/$1
 
@@ -12,6 +18,7 @@ srt_tvos() {
 
 # visionOS
 export TVOS_DEPLOYMENT_TARGET=13.0
+cp tvOS.cmake srt/scripts
 srt_tvos appletvsimulator SIMULATOR
 srt_tvos appletvos OS
 mkdir -p ./build/tvos/_SIMULATOR

SRTHaishinKit/Vendor/SRT/build-visionos.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Copyright (c) shogo4405 and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD 3-Clause License found in the
+# LICENSE file in the root directory of this source tree.
+
 srt_visionos() {
   VISION_OPENSSL=$(pwd)/OpenSSL/$1
 

SRTHaishinKit/Vendor/SRT/build-xcframework.sh

@@ -1,7 +1,20 @@
 #!/bin/bash
 
-cp module.modulemap Includes/module.modulemap
-cp ./build/ios/OS/version.h Includes/version.h
+# Copyright (c) shogo4405 and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD 3-Clause License found in the
+# LICENSE file in the root directory of this source tree.
+
+rm -rf Includes
+mkdir -p Includes/libsrt
+# creating a directory in libsrt to address modulemap conflicts.
+# seealso:
+#   https://github.com/shogo4405/HaishinKit.swift/discussions/1403
+#   https://github.com/jessegrosjean/swift-cargo-problem
+cp -f srt/srtcore/*.h Includes/libsrt
+cp module.modulemap Includes/libsrt/module.modulemap
+cp ./build/ios/OS/version.h Includes/libsrt/version.h
 
 rm -rf libsrt.xcframework
 xcodebuild -create-xcframework \

SRTHaishinKit/Vendor/SRT/libsrt.xcframework/Info.plist

@@ -48,83 +48,83 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>xros-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>xros</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>xros-arm64</string>
+			<string>xros-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>xros</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>xros-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>xros</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>