diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2020-06-29 23:37:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 15:37:40 -0700 |
| commit | 1f01a1fd25a67e7a985998a38b4963f6e16310e2 (patch) | |
| tree | 9c537da2051a24f46475490f02efd527a4689344 | |
| parent | 3c34afc1c44efd67f080b6fd6354f32e9ed182f0 (diff) | |
| download | vcpkg-1f01a1fd25a67e7a985998a38b4963f6e16310e2.tar.gz vcpkg-1f01a1fd25a67e7a985998a38b4963f6e16310e2.zip | |
[ffmpeg] Allow gpl builds without avisynthplus (#12083)
* [ffmpeg] Allow gpl builds without avisynthplus
* Update CONTROL
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
| -rw-r--r-- | ports/ffmpeg/CONTROL | 6 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index e2694ba68..fadb1a29c 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-12 +Version: 4.2-13 Build-Depends: zlib Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. @@ -59,5 +59,5 @@ Build-Depends: ffnvcodec, cuda Description: Hardware accelerated codecs Feature: avisynthplus -Build-Depends: avisynthplus -Description: avisynthplus support in ffmpeg
\ No newline at end of file +Build-Depends: avisynthplus, ffmpeg[gpl] +Description: avisynthplus support in ffmpeg diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 91f162365..727a96679 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -142,9 +142,9 @@ else() endif() if("avisynthplus" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} --enable-avisynth --enable-gpl") + set(OPTIONS "${OPTIONS} --enable-avisynth") else() - set(OPTIONS "${OPTIONS} --disable-avisynth --disable-gpl") + set(OPTIONS "${OPTIONS} --disable-avisynth") endif() set(OPTIONS_CROSS "") |