mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 14:59:05 +08:00
[ffmpeg] Block "tensorflow" and others for the "all" feature on non-x64. (#22984)
* [ffmpeg] Block "tensorflow" for the "all" feature on non-x64. In https://github.com/microsoft/vcpkg/pull/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
This commit is contained in:
parent
cef0e8a8c7
commit
439bf40945
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "ffmpeg",
|
"name": "ffmpeg",
|
||||||
"version": "4.4.1",
|
"version": "4.4.1",
|
||||||
"port-version": 7,
|
"port-version": 8,
|
||||||
"description": [
|
"description": [
|
||||||
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
|
"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."
|
"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."
|
||||||
@ -33,14 +33,12 @@
|
|||||||
"name": "ffmpeg",
|
"name": "ffmpeg",
|
||||||
"default-features": false,
|
"default-features": false,
|
||||||
"features": [
|
"features": [
|
||||||
"ass",
|
|
||||||
"avcodec",
|
"avcodec",
|
||||||
"avdevice",
|
"avdevice",
|
||||||
"avfilter",
|
"avfilter",
|
||||||
"avformat",
|
"avformat",
|
||||||
"avresample",
|
"avresample",
|
||||||
"bzip2",
|
"bzip2",
|
||||||
"fontconfig",
|
|
||||||
"freetype",
|
"freetype",
|
||||||
"iconv",
|
"iconv",
|
||||||
"lzma",
|
"lzma",
|
||||||
@ -76,6 +74,22 @@
|
|||||||
],
|
],
|
||||||
"platform": "!osx"
|
"platform": "!osx"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "ffmpeg",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"ass"
|
||||||
|
],
|
||||||
|
"platform": "!uwp"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "ffmpeg",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"fontconfig"
|
||||||
|
],
|
||||||
|
"platform": "!uwp"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "ffmpeg",
|
"name": "ffmpeg",
|
||||||
"default-features": false,
|
"default-features": false,
|
||||||
@ -116,14 +130,6 @@
|
|||||||
],
|
],
|
||||||
"platform": "!uwp"
|
"platform": "!uwp"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "ffmpeg",
|
|
||||||
"default-features": false,
|
|
||||||
"features": [
|
|
||||||
"tensorflow"
|
|
||||||
],
|
|
||||||
"platform": "!static"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "ffmpeg",
|
"name": "ffmpeg",
|
||||||
"default-features": false,
|
"default-features": false,
|
||||||
@ -140,6 +146,14 @@
|
|||||||
],
|
],
|
||||||
"platform": "!(uwp | arm)"
|
"platform": "!(uwp | arm)"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "ffmpeg",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"tensorflow"
|
||||||
|
],
|
||||||
|
"platform": "x64 & !static & !uwp"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "ffmpeg",
|
"name": "ffmpeg",
|
||||||
"default-features": false,
|
"default-features": false,
|
||||||
@ -170,7 +184,7 @@
|
|||||||
"features": [
|
"features": [
|
||||||
"tesseract"
|
"tesseract"
|
||||||
],
|
],
|
||||||
"platform": "!(windows & arm) & !static"
|
"platform": "!(windows & arm) & !static & !uwp"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -2154,7 +2154,7 @@
|
|||||||
},
|
},
|
||||||
"ffmpeg": {
|
"ffmpeg": {
|
||||||
"baseline": "4.4.1",
|
"baseline": "4.4.1",
|
||||||
"port-version": 7
|
"port-version": 8
|
||||||
},
|
},
|
||||||
"ffnvcodec": {
|
"ffnvcodec": {
|
||||||
"baseline": "11.1.5.0",
|
"baseline": "11.1.5.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387",
|
||||||
|
"version": "4.4.1",
|
||||||
|
"port-version": 8
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "8b692478001452049ea19d32ec199f58c5de3a77",
|
"git-tree": "8b692478001452049ea19d32ec199f58c5de3a77",
|
||||||
"version": "4.4.1",
|
"version": "4.4.1",
|
||||||
|
Loading…
Reference in New Issue
Block a user