Merge pull request #13 from cxfksword/ci

fix luagit can't load in swift 5.7.*

.github/workflows/build.yml

@@ -0,0 +1,26 @@
+# This workflow will build a Swift project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
+
+name: "🏗️ Build"
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Get swift version
+      run: swift --version
+    - name: Build
+      run: swift build -v
+    # - name: Run tests
+    #   run: swift test -v

Package.swift

@@ -179,7 +179,7 @@ let package = Package(
         ),
         .binaryTarget(
             name: "Libluajit",
-            path: "Sources/Libluajit-5.1.xcframework"
+            path: "Sources/Libluajit.xcframework"
         ),
 //        .binaryTarget(
 //            name: "Libsrt",

Plugins/BuildFFmpeg/main.swift

@@ -1344,6 +1344,24 @@ private class BuildBluray: BaseBuild {
 private class BuildLuaJIT: BaseBuild {
     init() {
         super.init(library: .libluajit)
+
+        // remove ABI version, xcframework with ABIVER can't build in swift 5.7.*
+        let makefile = directoryURL + "Makefile"
+        if let data = FileManager.default.contents(atPath: makefile.path), var str = String(data: data, encoding: .utf8) {
+            str = str.replacingOccurrences(of: "-$(ABIVER)", with: "")
+            try! str.write(toFile: makefile.path, atomically: true, encoding: .utf8)
+        }
+        let srcmakefile = directoryURL + "src/Makefile"
+        if let data = FileManager.default.contents(atPath: srcmakefile.path), var str = String(data: data, encoding: .utf8) {
+            str = str.replacingOccurrences(of: "-$(ABIVER)", with: "")
+            try! str.write(toFile: srcmakefile.path, atomically: true, encoding: .utf8)
+        }
+        let pcfile = directoryURL + "etc/luajit.pc"
+        if let data = FileManager.default.contents(atPath: pcfile.path), var str = String(data: data, encoding: .utf8) {
+            str = str.replacingOccurrences(of: "-${abiver}", with: "")
+            try! str.write(toFile: pcfile.path, atomically: true, encoding: .utf8)
+        }
+
     }
 
     override func build(platform: PlatformType, arch: ArchType) throws {
@@ -1381,7 +1399,7 @@ private class BuildLuaJIT: BaseBuild {
     }
 
     override func frameworks() throws -> [String] {
-        ["libluajit-5.1"]
+        ["libluajit"]
     }
 }
 

Sources/Libluajit-5.1.xcframework/Info.plist → Sources/Libluajit.xcframework/Info.plist

@@ -6,71 +6,71 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>Libluajit-5.1.framework</string>
+			<string>Libluajit.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>macos-arm64_x86_64</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>Libluajit-5.1.framework</string>
+			<string>Libluajit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
-			<string>Libluajit-5.1.framework</string>
+			<string>Libluajit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
-			<string>Libluajit-5.1.framework</string>
+			<string>Libluajit.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>macos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
-			<string>Libluajit-5.1.framework</string>
+			<string>Libluajit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

Sources/Libluajit-5.1.xcframework/ios-arm64/Libluajit-5.1.framework/Info.plist → Sources/Libluajit.xcframework/ios-arm64/Libluajit.framework/Info.plist

@@ -5,13 +5,13 @@
 <key>CFBundleDevelopmentRegion</key>
 <string>en</string>
 <key>CFBundleExecutable</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundleIdentifier</key>
-<string>com.kintan.ksplayer.Libluajit-5.1</string>
+<string>com.kintan.ksplayer.Libluajit</string>
 <key>CFBundleInfoDictionaryVersion</key>
 <string>6.0</string>
 <key>CFBundleName</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundlePackageType</key>
 <string>FMWK</string>
 <key>CFBundleShortVersionString</key>

Sources/Libluajit.xcframework/ios-arm64/Libluajit.framework/Modules/module.modulemap

@@ -0,0 +1,4 @@
+framework module Libluajit [system] {
+    umbrella "."
+    export *
+}

Sources/Libluajit-5.1.xcframework/ios-arm64_x86_64-simulator/Libluajit-5.1.framework/Info.plist → Sources/Libluajit.xcframework/ios-arm64_x86_64-simulator/Libluajit.framework/Info.plist

@@ -5,13 +5,13 @@
 <key>CFBundleDevelopmentRegion</key>
 <string>en</string>
 <key>CFBundleExecutable</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundleIdentifier</key>
-<string>com.kintan.ksplayer.Libluajit-5.1</string>
+<string>com.kintan.ksplayer.Libluajit</string>
 <key>CFBundleInfoDictionaryVersion</key>
 <string>6.0</string>
 <key>CFBundleName</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundlePackageType</key>
 <string>FMWK</string>
 <key>CFBundleShortVersionString</key>

Sources/Libluajit.xcframework/ios-arm64_x86_64-simulator/Libluajit.framework/Modules/module.modulemap

@@ -0,0 +1,4 @@
+framework module Libluajit [system] {
+    umbrella "."
+    export *
+}

Sources/Libluajit-5.1.xcframework/macos-arm64_x86_64/Libluajit-5.1.framework/Info.plist → Sources/Libluajit.xcframework/macos-arm64_x86_64/Libluajit.framework/Info.plist

@@ -5,13 +5,13 @@
 <key>CFBundleDevelopmentRegion</key>
 <string>en</string>
 <key>CFBundleExecutable</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundleIdentifier</key>
-<string>com.kintan.ksplayer.Libluajit-5.1</string>
+<string>com.kintan.ksplayer.Libluajit</string>
 <key>CFBundleInfoDictionaryVersion</key>
 <string>6.0</string>
 <key>CFBundleName</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundlePackageType</key>
 <string>FMWK</string>
 <key>CFBundleShortVersionString</key>

Sources/Libluajit.xcframework/macos-arm64_x86_64/Libluajit.framework/Modules/module.modulemap

@@ -0,0 +1,4 @@
+framework module Libluajit [system] {
+    umbrella "."
+    export *
+}

Sources/Libluajit-5.1.xcframework/tvos-arm64_arm64e/Libluajit-5.1.framework/Info.plist → Sources/Libluajit.xcframework/tvos-arm64_arm64e/Libluajit.framework/Info.plist

@@ -5,13 +5,13 @@
 <key>CFBundleDevelopmentRegion</key>
 <string>en</string>
 <key>CFBundleExecutable</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundleIdentifier</key>
-<string>com.kintan.ksplayer.Libluajit-5.1</string>
+<string>com.kintan.ksplayer.Libluajit</string>
 <key>CFBundleInfoDictionaryVersion</key>
 <string>6.0</string>
 <key>CFBundleName</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundlePackageType</key>
 <string>FMWK</string>
 <key>CFBundleShortVersionString</key>

Sources/Libluajit.xcframework/tvos-arm64_arm64e/Libluajit.framework/Modules/module.modulemap

@@ -0,0 +1,4 @@
+framework module Libluajit [system] {
+    umbrella "."
+    export *
+}

Sources/Libluajit-5.1.xcframework/tvos-arm64_x86_64-simulator/Libluajit-5.1.framework/Info.plist → Sources/Libluajit.xcframework/tvos-arm64_x86_64-simulator/Libluajit.framework/Info.plist

@@ -5,13 +5,13 @@
 <key>CFBundleDevelopmentRegion</key>
 <string>en</string>
 <key>CFBundleExecutable</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundleIdentifier</key>
-<string>com.kintan.ksplayer.Libluajit-5.1</string>
+<string>com.kintan.ksplayer.Libluajit</string>
 <key>CFBundleInfoDictionaryVersion</key>
 <string>6.0</string>
 <key>CFBundleName</key>
-<string>Libluajit-5.1</string>
+<string>Libluajit</string>
 <key>CFBundlePackageType</key>
 <string>FMWK</string>
 <key>CFBundleShortVersionString</key>

Sources/Libluajit.xcframework/tvos-arm64_x86_64-simulator/Libluajit.framework/Modules/module.modulemap

@@ -0,0 +1,4 @@
+framework module Libluajit [system] {
+    umbrella "."
+    export *
+}