diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2021-07-22 23:35:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 15:35:12 -0700 |
| commit | 5abd47dd40d39171a2b6926cd32bb775444368a7 (patch) | |
| tree | 7b45fe56aea123cb83bb63288f50667318835dbb /ports/ffmpeg | |
| parent | eea00aaa919f720e2dfc8b86ebe1402a5c4679be (diff) | |
| download | vcpkg-5abd47dd40d39171a2b6926cd32bb775444368a7.tar.gz vcpkg-5abd47dd40d39171a2b6926cd32bb775444368a7.zip | |
[libmodplug] [ffmpeg] fix libmodplug .pc file for static windows build (#18867)
* [libmodplug] fix pkg-config file for static builds on windows
* [libmodplug] convert CONTROL to vcpkg.json
* [libmodplug] bump port version
* [ffmpeg] enable modplug feature on static windows builds
* [ffmpeg] reformat manifest
* [ffmpeg] bump port version
* [ffmpeg] [libmodplug] x-add-version
* [libmodplug] simplify copyright file install
* [libmodplug] x-add-version
* [ffmpeg] bump port version
* [ffmpeg] x-add-version
* [ffmpeg] fix post-merge
* [ffmpeg] x-add-version
Diffstat (limited to 'ports/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 541f1da0c..654370f45 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -50,8 +50,8 @@ if("ilbc" IN_LIST FEATURES) endif() if("modplug" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'modplug' does not support 'uwp | (windows & static)'") + if (VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'modplug' does not support 'uwp'") endif() endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 958d56964..3dccdeb5d 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 9, + "port-version": 10, "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." @@ -66,6 +66,14 @@ "name": "ffmpeg", "default-features": false, "features": [ + "modplug" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ "opencl" ], "platform": "!uwp" @@ -138,14 +146,6 @@ "name": "ffmpeg", "default-features": false, "features": [ - "modplug" - ], - "platform": "!(windows & static) & !uwp" - }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ "tensorflow" ], "platform": "!(x86 | arm | uwp) & !static" |