Skip to content

Commit

Permalink
[ffmpeg] Block "tensorflow" and others for the "all" feature on non-x…
Browse files Browse the repository at this point in the history
…64. (#22984)

* [ffmpeg] Block "tensorflow" for the "all" feature on non-x64.

In #21980 , we removed all the blocks for tensorflow which were merely replicating that upstream's "supports" expression. That is the correct behavior: if upstream adds support for a thing, it should start being tested downstream. However, the "all" and "all-nonfree" features of ffmpeg attempt to turn on what is really "all supported" rather than "all", so the feature-dependency needs to be guarded.

Note that the ffmpeg[tensorflow] feature remains unguarded! It is ffmpeg[all]'s *dependency* on ffmpeg[tensorflow] that is guarded.

* Also guard ass, tensorflow, and fontconfig for uwp
  • Loading branch information
BillyONeal committed Feb 8, 2022
1 parent cef0e8a commit 439bf40
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 11 deletions.
34 changes: 24 additions & 10 deletions ports/ffmpeg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "4.4.1",
"port-version": 7,
"port-version": 8,
"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."
Expand Down Expand Up @@ -33,14 +33,12 @@
"name": "ffmpeg",
"default-features": false,
"features": [
"ass",
"avcodec",
"avdevice",
"avfilter",
"avformat",
"avresample",
"bzip2",
"fontconfig",
"freetype",
"iconv",
"lzma",
Expand Down Expand Up @@ -76,6 +74,22 @@
],
"platform": "!osx"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"ass"
],
"platform": "!uwp"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"fontconfig"
],
"platform": "!uwp"
},
{
"name": "ffmpeg",
"default-features": false,
Expand Down Expand Up @@ -120,25 +134,25 @@
"name": "ffmpeg",
"default-features": false,
"features": [
"tensorflow"
"ilbc"
],
"platform": "!static"
"platform": "!(arm & uwp)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"ilbc"
"ssh"
],
"platform": "!(arm & uwp)"
"platform": "!(uwp | arm)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"ssh"
"tensorflow"
],
"platform": "!(uwp | arm)"
"platform": "x64 & !static & !uwp"
},
{
"name": "ffmpeg",
Expand Down Expand Up @@ -170,7 +184,7 @@
"features": [
"tesseract"
],
"platform": "!(windows & arm) & !static"
"platform": "!(windows & arm) & !static & !uwp"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2154,7 +2154,7 @@
},
"ffmpeg": {
"baseline": "4.4.1",
"port-version": 7
"port-version": 8
},
"ffnvcodec": {
"baseline": "11.1.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387",
"version": "4.4.1",
"port-version": 8
},
{
"git-tree": "8b692478001452049ea19d32ec199f58c5de3a77",
"version": "4.4.1",
Expand Down

0 comments on commit 439bf40

Please sign in to comment.