Merge pull request #21 from cxfksword/develop

bump version to mpv 0.38.0 & FFmpeg n7.0

Plugins/BuildFFmpeg/main.swift

@@ -14,9 +14,9 @@ private enum Library: String, CaseIterable {
         case .libmpv:
             return "v0.38.0"
         case .FFmpeg:
-            return "n6.1.1"
+            return "n7.0"
         case .vulkan:
-            return "v1.2.7"
+            return "v1.2.8"
         case .libplacebo:  // depend vulkan lcms2 libdovi libshaderc, provides a powerful and flexible video rendering framework for mpv
             return "v6.338.2"
         case .libfontconfig:
@@ -1868,7 +1868,7 @@ private class BuildVulkan: BaseBuild {
         Utility.shell("tar xvf MoltenVK-all.tar", currentDirectoryURL: packageURL)
         try? FileManager.default.moveItem(at: packageURL + "MoltenVK", to: releaseURL)
         let oldXcframework = URL.currentDirectory + "../Sources/MoltenVK.xcframework"
-        let newXcframework = releaseURL + "MoltenVK/MoltenVK.xcframework"
+        let newXcframework = releaseURL + "MoltenVK/static/MoltenVK.xcframework"
         if FileManager.default.fileExists(atPath: newXcframework.path) {
             try? FileManager.default.removeItem(at: oldXcframework)
             try? FileManager.default.copyItem(at: newXcframework, to: oldXcframework)
@@ -1899,7 +1899,7 @@ private class BuildVulkan: BaseBuild {
                 let content = """
                 prefix=\((directoryURL + "Package/Release/MoltenVK").path)
                 includedir=${prefix}/include
-                libdir=${prefix}/MoltenVK.xcframework/\(platform.frameworkName)
+                libdir=${prefix}/static/MoltenVK.xcframework/\(platform.frameworkName)
 
                 Name: Vulkan-Loader
                 Description: Vulkan Loader
@@ -2054,10 +2054,10 @@ private class BuildMPV: BaseBuild {
             array.append("-Dswift-build=disabled")
             array.append("-Daudiounit=enabled")
             array.append("-Davfoundation=disabled")
-            array.append("-Dcoreaudio=disabled")
             array.append("-Dlua=disabled")
             if platform == .maccatalyst {
                 array.append("-Dcocoa=disabled")
+                array.append("-Dcoreaudio=disabled")
             } else {
                 array.append("-Dios-gl=enabled")
             }

README.md

@@ -1,7 +1,7 @@
 # MPVKit
 
 [![mpv](https://img.shields.io/badge/mpv-v0.38.0-blue.svg)](https://github.com/mpv-player/mpv)
-[![ffmpeg](https://img.shields.io/badge/ffmpeg-n6.1.1-blue.svg)](https://github.com/FFmpeg/FFmpeg)
+[![ffmpeg](https://img.shields.io/badge/ffmpeg-n7.0-blue.svg)](https://github.com/FFmpeg/FFmpeg)
 [![license](https://img.shields.io/github/license/cxfksword/MPVKit)](https://github.com/cxfksword/MPVKit/main/LICENSE)
 
 > MPVKit is only suitable for learning `libmpv` and will not be maintained too frequently.

Sources/Libavcodec.xcframework/Info.plist

@@ -6,34 +6,33 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>Libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>Libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>Libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
@@ -42,11 +41,13 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
@@ -55,37 +56,36 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>