[ffmpeg] reenable osx platform support for ffmpeg[sdl2] (#40391)

Co-authored-by: gs <gaoshan_yy@migu.cn>
Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
Co-authored-by: Monica <liuyumei01@beyondsoft.com>
This commit is contained in:
gaoshan 2024-08-21 14:37:38 +08:00 committed by GitHub
parent 9af7559904
commit a00ea194fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 10 deletions

View File

@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "7.0.2",
"port-version": 2,
"port-version": 3,
"description": [
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
@ -30,6 +30,13 @@
"all": {
"description": "Build with all allowed dependencies selected that are compatible with the lgpl license",
"dependencies": [
{
"name": "ffmpeg",
"default-features": false,
"features": [
"sdl2"
]
},
{
"name": "ffmpeg",
"default-features": false,
@ -68,14 +75,6 @@
],
"platform": "linux"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"sdl2"
],
"platform": "!osx"
},
{
"name": "ffmpeg",
"default-features": false,

View File

@ -2706,7 +2706,7 @@
},
"ffmpeg": {
"baseline": "7.0.2",
"port-version": 2
"port-version": 3
},
"ffnvcodec": {
"baseline": "12.1.14.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3bd67b806413f3013f1b3f303f757a3dd47e9f11",
"version": "7.0.2",
"port-version": 3
},
{
"git-tree": "c79d0466ceabb1aad30e085d2c35ce73a89b289d",
"version": "7.0.2",