Make builds use only one Package.swift

.github/workflows/nightly.yml

@@ -78,14 +78,11 @@ jobs:
 
     - name: Build with FFmpeg
       run: |
-        mv Package.swift Package.standalone.swift
-        mv Package.ffmpeg.swift Package.swift
         sha=$(git rev-parse --short HEAD)
-        xcrun swift build -Xswiftc -DFFMPEG --configuration release --arch arm64
+        USE_FFMPEG=1 xcrun swift build -Xswiftc -DFFMPEG --configuration release --arch arm64
         tar -cvJf macSubtitleOCR-nightly-ffmpeg-${sha}.tar.xz -C .build/release/ macSubtitleOCR
-        gpg --detach-sign --armor macSubtitleOCR-nightly-ffmpeg-${sha}.tar.xz
-        gpg --verify macSubtitleOCR-nightly-ffmpeg-${sha}.tar.xz.asc macSubtitleOCR-nightly-ffmpeg-${sha}.tar.xz
-
+        gpg --detach-sign --armor macSubtitleOCR-ffmpeg-nightly-${sha}.tar.xz
+        gpg --verify macSubtitleOCR-nightly-ffmpeg-${sha}.tar.xz.asc macSubtitleOCR-ffmpeg-nightly-${sha}.tar.xz
 
     - name: Publish
       uses: softprops/action-gh-release@v2
@@ -96,4 +93,4 @@ jobs:
         prerelease: true
         files: |
           macSubtitleOCR-nightly-*.tar.xz
-          macSubtitleOCR-nightly-*.tar.xz.asc
+          macSubtitleOCR-ffmpeg-nightly-*.tar.xz.asc

.github/workflows/release.yml

@@ -35,19 +35,16 @@ jobs:
         id: build
         run: |
           TAG=${{ github.ref_name }}
-          echo "::set-output name=version::${TAG#v}"
+          echo "version=${TAG#v}" >> $GITHUB_ENV
           xcrun swift build --configuration release --arch arm64
           tar -cvJf macSubtitleOCR-${TAG}.tar.xz -C .build/release/ macSubtitleOCR
           gpg --detach-sign --armor macSubtitleOCR-${TAG}.tar.xz
           gpg --verify macSubtitleOCR-${TAG}.tar.xz.asc macSubtitleOCR-${TAG}.tar.xz
 
       - name: Build with FFmpeg
         run: |
-          mv Package.swift Package.standalone.swift
-          mv Package.ffmpeg.swift Package.swift
           TAG=${{ github.ref_name }}
-          echo "::set-output name=version::${TAG#v}"
-          xcrun swift build -Xswiftc -DFFMPEG --configuration release --arch arm64
+          USE_FFMPEG=1 xcrun swift build -Xswiftc -DFFMPEG --configuration release --arch arm64
           tar -cvJf macSubtitleOCR-ffmpeg-${TAG}.tar.xz -C .build/release/ macSubtitleOCR
           gpg --detach-sign --armor macSubtitleOCR-ffmpeg-${TAG}.tar.xz
           gpg --verify macSubtitleOCR-ffmpeg-${TAG}.tar.xz.asc macSubtitleOCR-ffmpeg-${TAG}.tar.xz

.github/workflows/test.yml

@@ -21,9 +21,7 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          mv Package.swift Package.standalone.swift
-          mv Package.ffmpeg.swift Package.swift
-          brew install ffmpeg peripheryapp/periphery/periphery
+          brew install ffmpeg peripheryapp/periphery/periphery --quiet
 
       - name: Select Xcode
         uses: mxcl/xcodebuild@v3
@@ -32,7 +30,7 @@ jobs:
           action: none
 
       - name: Build Tests
-        run: xcrun swift test -Xswiftc -DGITHUB_ACTIONS -Xswiftc -DFFMPEG list
+        run: USE_FFMPEG=1 xcrun swift test -Xswiftc -DGITHUB_ACTIONS -Xswiftc -DFFMPEG list
 
       - name: Test FFmpeg Decoder
         timeout-minutes: 5
@@ -43,4 +41,4 @@ jobs:
         run: xcrun swift test --skip-build --filter internalDecoder
 
       - name: Periphery
-        run: periphery scan --skip-build --index-store-path .build/debug/index/store
+        run: periphery scan --skip-build --format github-actions --relative-results --strict

Package.swift

@@ -1,7 +1,20 @@
 // swift-tools-version: 6.0
 
+import Foundation
 import PackageDescription
 
+let hasFFmpeg = ProcessInfo.processInfo.environment["USE_FFMPEG"] == "1"
+
+#if arch(arm64)
+let includePath = "-I/opt/homebrew/include"
+let libPath = "-L/opt/homebrew/lib"
+#else
+let includePath = "-I/usr/local/include"
+let libPath = "-L/usr/local/lib"
+#endif
+let cSettings: [CSetting] = (hasFFmpeg ? [CSetting.unsafeFlags([includePath])] : [CSetting.unsafeFlags([])])
+let linkerSettings: [LinkerSetting] = (hasFFmpeg ? [LinkerSetting.unsafeFlags([libPath])] : [LinkerSetting.unsafeFlags([])])
+
 let package = Package(
     name: "macSubtitleOCR",
     platforms: [
@@ -15,7 +28,9 @@ let package = Package(
             name: "macSubtitleOCR",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser")
-            ]),
+            ] + (hasFFmpeg ? ["CFFmpeg"] : []),
+            cSettings: cSettings,
+            linkerSettings: linkerSettings),
         .testTarget(
             name: "macSubtitleOCRTests",
             dependencies: [
@@ -24,4 +39,11 @@ let package = Package(
             resources: [
                 .process("Resources")
             ])
-    ])
+    ] + (hasFFmpeg ? [
+        .systemLibrary(
+            name: "CFFmpeg",
+            pkgConfig: "libavformat libavcodec libavutil",
+            providers: [
+                .brew(["ffmpeg"])
+            ])
+    ] : []))

README.md

@@ -12,7 +12,9 @@ Currently PGS and VobSub subtitles are supported.
 
 For more details on OCR accuracy, refer to the [Accuracy](#accuracy) section below.
 
-An Apple M series processor is required for macSubtitleOCR, PRs adding additional support are welcomed.
+[Release](https://github.com/ecdye/macSubtitleOCR/releases/latest) and [Nightly](https://github.com/ecdye/macSubtitleOCR/releases/tag/nightly) builds are provided for arm64.
+Unfortunately, GitHub Actions doesn't provide a runner I can build x86_64 binaries on, sorry.
+However, you should be able to compile for x86_64 on you own machine by following the directions in the [Building the Project](#building-the-project) section below.
 
 ### Features
 
@@ -39,8 +41,7 @@ To build macSubtitleOCR, follow these steps:
 ``` shell
 git clone https://github.com/ecdye/macSubtitleOCR
 cd macSubtitleOCR
-make
-sudo make install
+swift build --configuration release
 ```
 
 ### Build With FFmpeg Decoder
@@ -51,8 +52,7 @@ To build with FFmpeg support, follow these steps:
 brew install ffmpeg
 git clone https://github.com/ecdye/macSubtitleOCR
 cd macSubtitleOCR
-make ffmpeg
-sudo make install_ffmpeg
+USE_FFMPEG=1 swift build --configuration release -Xswiftc -DFFMPEG
 ```
 
 ## Running Tests

Sources/CFFmpeg/CFFmpeg.h

@@ -0,0 +1,8 @@
+#ifndef CFFmpeg_h
+#define CFFmpeg_h
+
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/avutil.h>
+
+#endif

Sources/CFFmpeg/module.modulemap

@@ -1,7 +1,5 @@
 module CFFmpeg [system] {
-    header "/opt/homebrew/include/libavformat/avformat.h"
-    header "/opt/homebrew/include/libavcodec/avcodec.h"
-    header "/opt/homebrew/include/libavutil/avutil.h"
+    header "CFFmpeg.h"
     link "avformat"
     link "avcodec"
     link "avutil"

Sources/macSubtitleOCR/Subtitles/VobSub/VobSubParser.swift

@@ -14,7 +14,6 @@ struct VobSubParser {
 
     let subtitle: Subtitle
     private let masterPalette: [UInt8]
-    private let fps = 24.0 // TODO: Make this configurable / dynamic
     private let minimumControlHeaderSize = 22
 
     // MARK: - Lifecycle