From 5b9666103828727782861cd5886de59664ef55dc Mon Sep 17 00:00:00 2001 From: hjdhjd Date: Sat, 5 Oct 2024 13:41:02 -0500 Subject: [PATCH] FFmpeg v7 support and macOS Intel runner updates. (#88) --- .github/workflows/build.yml | 2 +- README.md | 16 ++++++++-------- build-ffmpeg | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26409eb..ce49c85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,7 @@ jobs: # Build for Intel macOS environments. - name: darwin-x86_64 - os: macos-13 + os: macos-15-large # Build for Intel 64-bit Windows environments. - name: windows-x86_64 diff --git a/README.md b/README.md index 018dd3e..3dfe901 100644 --- a/README.md +++ b/README.md @@ -15,22 +15,22 @@ This project provides static FFmpeg binaries for multiple platforms and architec Specifically, we provide: -* Audio support using `libfdk-aac` -* Hardware-accelerated encoding support on Intel platforms using `h264_qsv` and hardware-accelerated encoding on Raspberry Pi 3+ using `h264_v4l2m2m` -* Hardware-accelerated encoding support on Apple platforms using `videotoolbox` +* Audio support using `libfdk-aac`. +* Hardware-accelerated encoding support on Intel platforms using `h264_qsv` and hardware-accelerated encoding on Raspberry Pi 4+ using `h264_v4l2m2m`. +* Hardware-accelerated encoding support on Apple platforms using `videotoolbox`. ## Supported Platforms - | OS | Supported Architectures | |-------------------------------------|--------------------------------| | FreeBSD | x86_64 | | Linux | x86_64, armv7l, aarch64 | -| macOS 14.0 (Sonoma) or newer | x86_64, arm64 (Apple Silicon) | -| Raspberry Pi 4 or better (Raspbian) | armv7l, aarch64 | +| macOS 15.0 (Sequoia) or newer | x86_64, arm64 (Apple Silicon) | +| Raspberry Pi 4 (Raspbian) | armv7l, aarch64 | | Windows 10 or newer | x86_64 | -**Note: Raspberry Pi 5 is currently unsupported. There are multiple known issues that will be addressed in a future release.** -## Install +> [!NOTE] +> * Raspberry Pi 5 is currently unsupported. There are multiple known issues with FFmpeg and Raspberry Pi 5 that will hopefully be addressed by the respective teams in the future.** +> * Currently (October 2024), FFmpeg v7.1 appears to be somewhat broken for HEVC and H.264 decoding in some scenarios. We hope to support future FFmpeg LTS releases as they stabilize and mature.** #### Raspbian or armv7/armv8-based Linux environments: diff --git a/build-ffmpeg b/build-ffmpeg index 5a6b69c..26e592b 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -6,7 +6,7 @@ # LICENSE: https://github.com/markus-perl/ffmpeg-build-script/blob/master/LICENSE # PROGNAME=$(basename "$0") -FFMPEG_VERSION=6.1.2 +FFMPEG_VERSION=7.0 SCRIPT_VERSION=1.47 CWD=$(pwd) PACKAGES="${CWD}/packages" diff --git a/package-lock.json b/package-lock.json index 181c1ff..1a67d75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ffmpeg-for-homebridge", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index ac6e0f0..3184943 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffmpeg-for-homebridge", - "version": "2.1.2", + "version": "2.1.3", "description": "Static FFmpeg binaries for Homebridge with support for audio (libfdk-aac) and hardware encoding (h264_v4l2m2m and h264_qsv).", "author": { "name": "The Homebridge Team",