diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 9187f0d..022cc10 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -24,12 +24,17 @@ jobs: uses: "actions/checkout@v4" with: submodules: "recursive" - + - name: "Install build dependencies" run: "brew install automake autoconf libtool meson autogen gtk-doc bison yasm" - name: "Add bison to PATH" run: 'echo "$(brew --prefix)/opt/bison/bin" >> "$GITHUB_PATH"' + + - name: "Download and extract FFmpegKit" + run: | + curl -fsSL https://github.com/arthenica/ffmpeg-kit/archive/refs/tags/v6.0.LTS.tar.gz | tar -xz + mv ffmpeg-kit-6.0.LTS ffmpeg-kit - name: "Build XCFrameworks" working-directory: "ffmpeg-kit" diff --git a/.gitignore b/.gitignore index cd00854..07f5d78 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,5 @@ fastlane/test_output # https://github.com/johnno1962/injectionforxcode iOSInjectionProject/ + +ffmpeg-kit*/ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d3f7c4b..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "ffmpeg-kit"] - path = ffmpeg-kit - url = https://github.com/arthenica/ffmpeg-kit.git diff --git a/Package.swift b/Package.swift index cf848b2..8aed395 100644 --- a/Package.swift +++ b/Package.swift @@ -23,42 +23,42 @@ let package = Package( .binaryTarget( name: "ffmpegkit", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/ffmpegkit.xcframework.zip", - checksum: "2c6cd33fd317909d2c015ec435cab4e0a82c2e7572269ead04b43506b5a7a4ee"), + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/ffmpegkit.xcframework.zip", + checksum: "e12ee3023d81bd6cbe5dcfba18b0b20c1d7896f4cb0c28eedcc4e4e45b3319aa"), .binaryTarget( name: "libavcodec", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/libavcodec.xcframework.zip", - checksum: "38e5c38e170bd5b0f1ccd7d36bcb78acaab6f05557e2061fa007b1666cb48e98"), + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/libavcodec.xcframework.zip", + checksum: "f188ed68f6150479de6d8a647604f857a01d1f2000639a628cd73d57cd849465"), .binaryTarget( name: "libavdevice", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/libavdevice.xcframework.zip", - checksum: "d80ce6ba96ba11381aa713bca4c92e2b41ab6ddb38cc18862cbf16bf793648bc"), + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/libavdevice.xcframework.zip", + checksum: "5db009af634e80d95924e474a3a999a8473626c6fafe199bc0785898d82d2ca6"), .binaryTarget( name: "libavfilter", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/libavfilter.xcframework.zip", - checksum: "2bdc466246579b9e1b27389d980b4e2fa86e6299ffd5d996a95127223774f3a7"), + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/libavfilter.xcframework.zip", + checksum: "9cbae6a0b2731e965ba44df97b6444a622d287c8105319effb6d96c6b5093edf"), .binaryTarget( name: "libavformat", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/libavformat.xcframework.zip", - checksum: "c27699089947137d04f5bca132cf7065394fd01b933abfc48187f371289976cb"), + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/libavformat.xcframework.zip", + checksum: "0466fd6adf26181d224b1984321d3eccfef0feb5c2652fb2852cc0594c814b54"), .binaryTarget( name: "libavutil", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/libavutil.xcframework.zip", - checksum: "f5e5f77bfcea9d01608cd1c9a95a79b5dbc4422036d4fcfdd0e12dc456b7de06"), + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/libavutil.xcframework.zip", + checksum: "b49923674e14dedbd4c8236d80ccb630d7445299c1988dc1f9dd0f13c15e69fe"), .binaryTarget( name: "libswresample", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/libswresample.xcframework.zip", - checksum: "eca0fc496ffe55739a0d49b8933acc57b6c0cf317666ef7538378932e5b53c48"), + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/libswresample.xcframework.zip", + checksum: "725f191d85333d2e7bf01604006209b66f68fc574272bbf955f4d807817247bf"), .binaryTarget( name: "libswscale", url: - "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.2/libswscale.xcframework.zip", - checksum: "3807328203e9650cc72d5aef84f3f18dda36540a5a6b627b7933ff078bacfdac") + "https://github.com/kaito-tokyo/ffmpeg-kit-spm/releases/download/6.0.3/libswscale.xcframework.zip", + checksum: "07b084c1ecceed1e1fb458f6205d749ec42f7d1750d5d6e472115fba8ab5e9be") ] ) diff --git a/ffmpeg-kit b/ffmpeg-kit deleted file mode 160000 index d6be56d..0000000 --- a/ffmpeg-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d6be56d7aec286eb3c292d6b23ff07a6b70d8693