diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2021-07-16 08:16:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 00:16:41 -0700 |
| commit | 30d8b36c58192d8a870a211abd2f761480bc0c7b (patch) | |
| tree | 4fc8169c71a85a75787443513606e4a6cf2c69eb | |
| parent | 394e6f0997ba6c4d09d959099e14889a16be69de (diff) | |
| download | vcpkg-30d8b36c58192d8a870a211abd2f761480bc0c7b.tar.gz vcpkg-30d8b36c58192d8a870a211abd2f761480bc0c7b.zip | |
[ffmpeg] enable opengl feature on osx (#18624)
* [ffmpeg] enable opengl feature on osx
* [ffmpeg] x-add-version
* [ffmpeg] remove opengl osx check in portfile
* [ffmpeg] x-add-version
* Update ports/ffmpeg/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [ffmpeg] x-add-version
* [ffmpeg] bump port version
* [ffmpeg] x-add-version
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 18 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 17 insertions, 12 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1b677396e..541f1da0c 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -66,8 +66,8 @@ if("opencl" IN_LIST FEATURES) endif() if("opengl" IN_LIST FEATURES) - if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'") + if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm)") endif() endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index efdb888bf..958d56964 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 8, + "port-version": 9, "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." @@ -122,33 +122,33 @@ "name": "ffmpeg", "default-features": false, "features": [ - "dav1d" + "opengl" ], - "platform": "!(uwp | arm | x86 | osx)" + "platform": "!uwp & !(windows & arm)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "modplug" + "dav1d" ], - "platform": "!(windows & static) & !uwp" + "platform": "!(uwp | arm | x86 | osx)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "tensorflow" + "modplug" ], - "platform": "!(x86 | arm | uwp) & !static" + "platform": "!(windows & static) & !uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "opengl" + "tensorflow" ], - "platform": "!uwp & !(windows & arm) & !osx" + "platform": "!(x86 | arm | uwp) & !static" }, { "name": "ffmpeg", diff --git a/versions/baseline.json b/versions/baseline.json index a25491dbf..a58944d60 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1990,7 +1990,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 8 + "port-version": 9 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 04750b6af..0c863b404 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4", + "version": "4.4", + "port-version": 9 + }, + { "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b", "version": "4.4", "port-version": 8 |