Commit Graph

73 Commits

Author SHA1 Message Date
Jack·Boos·Yu
0fd31b9dbb
[vcpkg baseline][ffmpeg] Fix dependency alsa (#22110)
* [vcpkg baseline][ffmpeg] Fix dependency alsa

* version

* fix option name

* version

* Apply suggestion

* version
2021-12-20 23:55:52 -08:00
Matthew Oliver
eea8042d00
[ffmpeg] Fix detection of x264. (#21875) 2021-12-06 21:27:58 -08:00
Billy O'Neal
b3cfaaf1bb
Update tool to 2021-11-24. (#21654)
* Update tool to 2021-11-24.

* Reformat ports affected by https://github.com/microsoft/vcpkg-tool/pull/282
2021-11-26 01:25:06 -08:00
Andy Li
6554f4d13d
[ffmpeg] update version to 4.4.1 (#21049)
* [ffmpeg] update to 4.4.1

* Update version database

* update version

* update version

Co-authored-by: Jonliu1993 <13720414433@163.com>
2021-11-12 16:39:29 -08:00
NancyLi1013
897ff9372f
[sdl2] Add feature x11 (#21188)
* [ssdl2] Add feature x11

* Update dependencies

* Update version files
2021-11-11 13:47:51 -08:00
Matthew Oliver
40a0fb2328
[x264] Update to latest stable version. (#21028)
* [x264] Update to latest stable version.

* [ffmpeg] Fix static x264 linking.
2021-11-03 22:07:18 -07:00
Matthew Oliver
c3db26403c
[ffmpeg] Add libaom support. (#20867)
* [aom] Update to  3.2.0

* [ffmpeg] Add libaom support.

* fixup
2021-10-26 23:02:23 -07:00
omartijn
d6245fc7d9
[ffmpeg] Honor macosx deployment target for ffmpeg (#18460)
* Honor macosx deployment target for ffmpeg

* fixup! Honor macosx deployment target for ffmpeg

Co-authored-by: Martijn Otto <git@martijnotto.nl>
Co-authored-by: Martijn Otto <martijn@resolume.com>
2021-10-06 11:06:35 -07:00
Phoebe
eb9cb29166
[ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature (#19358)
* [ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature

* Update the baseline version

* [opencv3] Update the feature dependency

* Update the baseline

* [opencv2] Update the feature dependency

* Update the baseline version

* Fix uwp build failures

* Update the baseline version

* Fix opencv2 version

* update the baseline version

* update the baseline version

* Un-edit git-tree.

* Update cuda feature

* Update the baseline

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-13 08:46:11 -07:00
Be
d306ab43c7
[fdk-aac] make patent-encumbered HE-AAC optional (#16007)
* [fdk-aac] make patent-encumbered HE-AAC optional

By default, use a fork of fdk-aac (which was originally written
by Fraunhofer for the Android Open Source Project) which has
support for the patent-encumbered HE-AAC, HE-AACv2, and xHE-AAC
profiles removed. This fork is used by Fedora and Arch Linux to
provide support for most AAC use cases without patent licensing
fees and to permit combining it with GPL software. The upstream
fdk-aac with support for all AAC profiles can be built with the
new 'he-aac' option for this port.

Fedora Legal's opinion, from
https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112 :
The Fedora Project is aware that the Free Software Foundation
has stated that the Fraunhofer FDK AAC license is GPL
incompatible, specifically, because of Clause 3.

We believe that the fdk-aac software codec implementation that we
wish to include in Fedora is no longer encumbered by AAC patents.
This fact means that Clause 3 in the FDK AAC license is a "no op",
or to put it plainly, if no patents are in play, there are no
patent licenses to disclaim. For this (and only this) specific
implementation of fdk-aac, we believe that the FDK AAC license is
GPL compatible.

Also:
* remove restriction on dynamic linking. Upstream has a .def
file which is used by CMake.
* replace deprecated vcpkg functions

* [ffmpeg] use fdk-aac[he-aac] for fdk-aac feature

There is no point to this feature without HE-AAC because FFmpeg has
its own AAC codec that does not support HE-AAC.
2021-08-12 15:56:51 -07:00
nicole mazzuca
5304f826b5
[rollup] 2021-07-26 (#19157)
* [rollup:2021-07-26 1/6] PR #18783 (@strega-nil)

[scripts-audit] vcpkg_copy_tools and friends

* [rollup:2021-07-26 2/6] PR #18898 (@dg0yt)

[vcpkg] Fix toolchain compatibility with cmake < 3.15

* [rollup:2021-07-26 3/6] PR #18980 (@strega-nil)

[cmake-guidelines] Minor update, for `if()`

* [rollup:2021-07-26 4/6] PR #18981 (@strega-nil)

[scripts-audit] vcpkg_check_linkage

* [rollup:2021-07-26 5/6] PR #19158 (@Hoikas)

[vcpkg.cmake] Fix variable case.

* [rollup:2021-07-26 6/6] PR #18839

[scripts-audit] z_vcpkg_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-07-29 09:47:35 -07:00
Alexandre Bique
db4d9760aa
[ffmpeg] fix cross compilation on mac arm64 to x86_64 (#18737)
* [ffmpeg] fix cross compilation on mac arm64 to x86_64

* Bump port-version

* Bump port-version again.

Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
2021-07-27 15:48:31 -07:00
Matthias C. M. Troffaes
5abd47dd40
[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
2021-07-22 15:35:12 -07:00
Matthias C. M. Troffaes
30d8b36c58
[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>
2021-07-16 00:16:41 -07:00
Matthew Oliver
ee66b89059
[ffmpeg] Enable fdk on arm or uwp. (#18659) 2021-07-15 16:39:25 -07:00
Matthias C. M. Troffaes
7179350f94
[ffmpeg] fix LGPL build, disable avisynthplus on static builds (#18803)
* [ffmpeg] do not pull in postproc for LGPL build

* [ffmpeg] disable avisynthplus on static builds (as it is not functional)

* [ffmpeg] bump port version

* [ffmpeg] x-add-version
2021-07-06 13:45:15 -07:00
omartijn
6d47a2faec
[ffmpeg] multi arch support (#18635)
* Expand Architecture list with escape chars

This expands the architecture lists with escape characters. When
building FAT binaries for macos using multiple architectures in the
values they need to be escaped otherwise they are passed on to CMake
incorrectly #14932

* Adding the architecture fix to vcpkg-cmake port
updating port vcpkg-cmake version

* updated version in baseline

* Allow building ffmpeg for multiple architectures on macOS

Since ffmpeg does _not_ support multi-arch builds due to their use of
autotools and config.h which then includes the wrong platform-dependent
functions, we must perform two separate builds and join them using lipo

* fixup! Allow building ffmpeg for multiple architectures on macOS

* fixup! Allow building ffmpeg for multiple architectures on macOS

Co-authored-by: Sander Cox <sander@paralleldimension.nl>
Co-authored-by: Martijn Otto <martijn@resolume.com>
2021-07-01 09:24:59 -07:00
Matthew Oliver
6e024e744e
[ffmpeg] Warn/fail when selecting unsupported features. (#17153)
* [ffmpeg] Warn/fail when selecting unsupported features.

* Update ffmpeg.json

* Bump port-version

* Update ffmpeg.json

* [ffmpeg] Check for gpl/nonfree aswell as all option.

* avisynth now support static linking

* fixup typo

* Update ffmpeg.json

* Revert to fatal error on even when all is selected

* Update ffmpeg.json

* [ffmpeg] Disable openh264 on uwp

* update

* Update versions/f-/ffmpeg.json

* update

* Update ffmpeg.json

* update

* update

* Update

Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2021-06-17 13:12:58 -07:00
Matthias C. M. Troffaes
b598c70a6c
[ffmpeg] fix release-only builds (#18367)
* [ffmpeg] fix release-only builds

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] strequal: use quotes when comparing against strings

* [ffmpeg] x-add-version
2021-06-11 10:01:10 -07:00
Matthias C. M. Troffaes
1d6e1be7ac
[ffmpeg] use pkgconfig to get system dependencies for cmake (#17985)
* [ffmpeg] use ffbuild/config.mak to get dependencies

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] fix dependency issue on x64-linux

* [ffmpeg] x-add-version

* [ffmpeg] link order fix on linux

* [ffmpeg] x-add-version

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] exclude -lgcc and -lgcc_s (causes issues on azure for unknown reasons)

* [ffmpeg] x-add-version

* [ffmpeg] handle -lgcc and -lgcc_s appropriately

* [ffmpeg] x-add-version

* [ffmpeg] use x_vcpkg_pkgconfig_get_modules to get info, added some more fixes to generated for pkgconfig files

* [ffmpeg] report dependencies (for now, helps debugging)

* [vcpkg-pkgconfig-get-modules] bump port version

* [ffmpeg] [vcpkg-pkgconfig-get-modules] x-add-version

* [ffmpeg] fix variant issue

* [ffmpeg] x-add-version

* [ffmpeg] reformat manifest

* [ffmpeg] x-add-version

* [ffmpeg] remove duplicate avfilter library from dependencies

* [ffmpeg] fix -pthread / -pthreads on linux

* [ffmpeg] x-add-version

* [ffmpeg] fix dynamic builds when no libraries need to be linked

* [ffmpeg] x-add-version

* [ffmpeg] disable openh264 on uwp when building all

* [ffmpeg] x-add-version

* [avcpp] fix uwp build failure due to deprecations treated as errors

* [avcpp] bump port version

* [avcpp] x-add-version

* [avcpp] smaller patch

* [avcpp] x-add-version

* [ffmpeg] x-add-version
2021-06-09 15:25:20 -07:00
Martin Vejdarski
c4fedf081d
[ffmpeg] Add support for arm64 on macOS (#18182)
* [FFmpeg] Add support for arm64 on macOS

* [ffmpeg] x-add-version

* [ffmpeg] Rename version-string to version

* [ffmpeg] x-add-version

* minor fixes

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-03 14:56:43 -07:00
autoantwort
19b171468d
[ffmpeg] add usage (#17284)
* [ffmpeg] add usage

* [ffmpeg] increase version

* add version files

* add version files

* Trigger Build

* add version files

* Trigger Build

* Trigger Build

* Bump port-version.

* Trigger Build

* add version files

* Trigger Build

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
2021-05-21 01:20:29 -07:00
Matthias C. M. Troffaes
44e8841e06
[ffmpeg] update to upstream version 4.4 (#17735)
* [ffmpeg] update to version 4.4

* [ffmpeg] format-manifest

* [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5)

* [ffmpeg] x-add-version

* [ffmpeg] add avresample under the all feature

* [ffmpeg] x-add-version

* [ffmpeg] remove unused patch

* [ffmpeg] x-add-version

* [ffmpeg] remove wavpack from FindFFMPEG

* [ffmpeg] x-add-version

* [ffmpeg] fix compile cuda issue

* [ffmpeg] x-add-version

* [ffmpeg] only apply cuda compile patch on windows targets

* [ffmpeg] x-add-version
2021-05-17 23:18:50 -07:00