From 0a787c8aba3aebccde617292d731843081e3eaac Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Fri, 8 Nov 2024 21:23:14 +0000 Subject: [PATCH 1/3] update project README --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 454ae6d9..68ed59d8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ -`FFmpegKit` is a collection of tools to use `FFmpeg` in `Android`, `iOS`, `Linux`, `macOS`, `tvOS`, `Flutter` and `React Native` applications. +`FFmpegKit` is a collection of tools to use `FFmpeg`1 in `Android`, `iOS`, `Linux`, `macOS`, `tvOS`, `Flutter` and `React Native` applications. It includes scripts to build `FFmpeg` native libraries, a wrapper library to run `FFmpeg`/`FFprobe` commands in applications and 8 prebuilt binary packages available at [Github](https://github.com/arthenica/ffmpeg-kit/releases), @@ -219,11 +219,15 @@ that you seek legal advice first. See [FFmpeg Patent Mini-FAQ](https://ffmpeg.or distribute that library, then you are subject to pay MPEG LA licensing fees. Refer to [OpenH264 FAQ](https://www.openh264.org/faq.html) page for the details. -### 16. Contributing +### 16. Trademarks + +1 `FFmpeg` is a trademark of [Fabrice Bellard](http://www.bellard.org/). `FFmpegKit` is an independent project and not affiliated with the `FFmpeg` trademark holder. + +### 17. Contributing See our [CONTRIBUTING](CONTRIBUTING.md) guide. -### 17. See Also +### 18. See Also - [FFmpeg API Documentation](https://ffmpeg.org/doxygen/4.0/index.html) - [FFmpeg Wiki](https://trac.ffmpeg.org/wiki/WikiStart) From 6cf36b41ec71309d96b31aa65c4d7698bfd1ed1d Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Fri, 8 Nov 2024 22:30:21 +0000 Subject: [PATCH 2/3] dont run github actions with xcode 14 on sonoma --- .github/workflows/ios-build-scripts.yml | 2 +- .github/workflows/macos-build-scripts.yml | 2 +- .github/workflows/periodic-builds-apple.yml | 6 +++--- .github/workflows/tvos-build-scripts.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ios-build-scripts.yml b/.github/workflows/ios-build-scripts.yml index de252d64..40387ce7 100644 --- a/.github/workflows/ios-build-scripts.yml +++ b/.github/workflows/ios-build-scripts.yml @@ -32,7 +32,7 @@ jobs: runs-on: macos-14 strategy: matrix: - xcode: [ '14.3.1', '15.3' ] + xcode: [ '15.4', '16.0' ] defaults: run: shell: bash diff --git a/.github/workflows/macos-build-scripts.yml b/.github/workflows/macos-build-scripts.yml index f4f22281..d76fcfe6 100644 --- a/.github/workflows/macos-build-scripts.yml +++ b/.github/workflows/macos-build-scripts.yml @@ -32,7 +32,7 @@ jobs: runs-on: macos-14 strategy: matrix: - xcode: [ '14.3.1', '15.3' ] + xcode: [ '15.4', '16.0' ] defaults: run: shell: bash diff --git a/.github/workflows/periodic-builds-apple.yml b/.github/workflows/periodic-builds-apple.yml index 24ab696d..6b3b19b9 100644 --- a/.github/workflows/periodic-builds-apple.yml +++ b/.github/workflows/periodic-builds-apple.yml @@ -10,7 +10,7 @@ jobs: runs-on: macos-14 strategy: matrix: - xcode: [ '14.3.1', '15.3' ] + xcode: [ '15.4', '16.0' ] branches: [ 'main', 'development' ] defaults: run: @@ -62,7 +62,7 @@ jobs: runs-on: macos-14 strategy: matrix: - xcode: [ '14.3.1', '15.3' ] + xcode: [ '15.4', '16.0' ] branches: [ 'main', 'development' ] defaults: run: @@ -114,7 +114,7 @@ jobs: runs-on: macos-14 strategy: matrix: - xcode: [ '14.3.1', '15.3' ] + xcode: [ '15.4', '16.0' ] branches: [ 'main', 'development' ] defaults: run: diff --git a/.github/workflows/tvos-build-scripts.yml b/.github/workflows/tvos-build-scripts.yml index 356a414c..eaee3abd 100644 --- a/.github/workflows/tvos-build-scripts.yml +++ b/.github/workflows/tvos-build-scripts.yml @@ -32,7 +32,7 @@ jobs: runs-on: macos-14 strategy: matrix: - xcode: [ '14.3.1', '15.3' ] + xcode: [ '15.4', '16.0' ] defaults: run: shell: bash From 826fbb7b773aeb15147b9b4affc39fcffcc40ffc Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Sat, 9 Nov 2024 11:39:37 +0000 Subject: [PATCH 3/3] drop macos-11 from github actions --- .github/workflows/android-build-scripts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-build-scripts.yml b/.github/workflows/android-build-scripts.yml index 51005c23..921f12ae 100644 --- a/.github/workflows/android-build-scripts.yml +++ b/.github/workflows/android-build-scripts.yml @@ -118,7 +118,7 @@ jobs: run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log' build-lts-on-macos: name: android lts on macos - runs-on: macos-11 + runs-on: macos-12 strategy: matrix: ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin' ]