Commit Graph

58 Commits

Author SHA1 Message Date
Matthias C. M. Troffaes
193e348cf3
[ffmpeg] use OPENSSL_LIBRARIES generated by upstream cmake FindOpenSSL script (fixes linux openssl linking) (#14388) 2020-11-05 18:29:55 -08:00
Matthias C. M. Troffaes
c98fa197cc
[ffmpeg] add if guard, fix library ordering on linux, minor clean up (#14360)
* [ffmpeg] add 'if(NOT FFMPEG_FOUND)' guard to FindFFMPEG script

* [ffmpeg] fix link order on x64-linux (dependencies must come after the library that needs the dependency)

* [ffmpeg] bump port version
2020-11-03 23:15:22 -08:00
Matthias C. M. Troffaes
4ec138faea
[ffmpeg] fix x264 feature linking on x64-linux (#14330)
* [ffmpeg] fix x264 feature linking on x64-linux

* [ffmpeg] increment port version
2020-11-02 13:57:18 -08:00
Matthias C. M. Troffaes
057177cfa3
[ffmpeg] fix mp3lame feature linking on x64-linux (#14266) 2020-10-30 14:51:50 -07:00
Matthias C. M. Troffaes
0ff714bd52
[ffmpeg] link against dl on unix when nvcodec feature is enabled (#14219) 2020-10-28 14:24:51 -07:00
Matthias C. M. Troffaes
83ce14a29a
[ffmpeg] fix theora, speex, and openssl static linkage, and refactor/robustify library selection code into functions (#14026) 2020-10-20 11:28:09 -07:00
Matthias C. M. Troffaes
b1517c933e
[ffmpeg:x64-linux] install tools also on non-windows platforms (#13932)
* [ffmpeg:x64-linux] install tools

* [ffmpeg] use vcpkg_copy_tools to copy tools
2020-10-13 13:36:20 -07:00
Matthew Oliver
72d98524e3
[ffmpeg] Update to 4.3.1 (#13365)
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-10-07 00:23:23 -07:00
Matthias C. M. Troffaes
19616d121b
[ffmpeg] fix zlib feature support on x64-linux (fixes #13768) (#13780) 2020-10-06 14:37:25 -07:00
Matthias C. M. Troffaes
d548c67744
[ffmpeg] fix feature dependencies (#13502)
* [ffmpeg] fix feature dependencies

* do not pull in default depedencies when specifying nonfree/gpl
* explicitly mark postproc as gpl
* add required dependencies for ffmpeg, ffplay, and ffprobe
* remove defunct ffserver feature (this feature was removed in ffmpeg a while ago)

* [ffmpeg] fix feature dependencies for avformat and avdevice

* [ffmpeg] Bump port-version to 25

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-09-24 12:29:47 -07:00
xyb
5c9e670767
[ffmpeg:arm64-linux] Fix bug #13511: [ffmpeg:arm64-linux] build failure. (#13512)
Root cause:
In `ffmpeg/portfile.cmake`, `--target-os=win32` is applied to all arm or arm64 targets.
This is wrong.

Fix:
Only apply "--target-os=win32" if VCPKG_TARGET_IS_WINDOWS.

Verify:
Run `./vcpkg install ffmpeg` on arm64-linux host, make sure the generated libraries are *.a not *.lib.
2020-09-14 16:06:48 -07:00
Rafael Kitover
85247c3981
Fix ffmpeg build for PATH with spaces. (#13275)
Followup on 085225b7b.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-09-03 13:58:57 -07:00
ras0219
46e25a10d7
[vcpkg] Replace uses of msys pacman.exe with direct package downloads (#13019)
* wip

Apply suggestions from code review

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [vcpkg_acquire_msys] Trim list of packages. Introduce defaults.

* [behaviortree-cpp] Fix dynamic dependency on ZMQ

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-08-31 22:36:25 -07:00
Stefano Sinigardi
0ccb9d3148
[ffmpeg] fix cmake module (#13004) 2020-08-21 15:47:31 -07:00
Matthew Oliver
272269583c
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277)
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-18 12:58:14 -07:00
Sander Cox
234f7e4543
[ffmpeg] Some libraries in ffmpeg can be optional (#12843)
* Make sub libraries of FFmpeg optional

avdevice
avfilter
swresample
swscale

* Also adding avcodec and avformat

* This should have been avcodec obviously
2020-08-14 10:01:01 -07:00
Matthias C. M. Troffaes
98b9ed1860
[ffmpeg] fix FindFFMPEG.cmake to work properly even without avresample (#12635)
* [ffmpeg] fix FindFFMPEG.cmake to work properly even without avresample

When building ffmpeg[core] (without avresample support), FindFFMPEG.cmake
claims to not have fully found the ffmpeg libraries, because it still looks
for the avresample library. This patch fixes that problem.

* [ffmpeg] minor update for consistency

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* [ffmpeg] minor update for consistency

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2020-08-06 22:17:38 -07:00
Vicki Pfau
b46242ff15
[many ports] Remove _find_package guards that break *_FOUND (#12157)
* [many ports] Remove _find_package guards that break *_FOUND

* [many ports] Fix incrementing version

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-08-01 17:13:08 -07:00
Stefano Sinigardi
f1e7a3f167
[opencv4] update to v4.3 (#11130)
* [opencv4] draft update to v4.3

* restore uwp patch

* fix qt and ipp features

* fix libepoxy and meson on osx

* fix baseline, trigger a full rebuild due to meson tool changes

* remove jpeg feature on windows due to a bug with MSVC

* minor fixes for some features

* ffmpeg x11 lib not required anymore on apple for downstream projects

* small fixes for ogre and qt5

* remove a broken module

* fix installation path

* fix openexr which was broken and regressed opencv downstream projects

* first round of ci passes

* improve compatibility with android toolchain

* [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR

* fix OpenEXR link for downstream projects

* do not install unrequested features

* fix compatibility with newer OpenEXR

* [OpenCV3] update to v3.4.10

* fix openexr on windows, was creating symlinks that broke vcpkg

* fix openexr wrapper

* [openexr] cmake config files are installed into a lowered-case folder

* remove mangled paths trying to fix android setup

* disable dnn on android, fix mangled cmake config paths again

* fix downstream CUDA dependency

* fix compatibility with vs16.6

* remove from baseline ports now passing tests

* [alembic] fixes for new openexr

* fix baseline

* [field3d] fixes for new openexr

* [field3d] improve fixes, windows still unsupported despite what is said upstream

* apply fixes required from review

* add missing field3d patch

* [field3d] disable mpi integration

* [opencv2] remove cublas integration

* [vtk] do not create libharu::libharu target if already existing

* Update ports/opencv4/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/opencv3/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* improve compatibility with newer CUDNN

* [OpenCV3, OpenCV4] improve compatibility with CUDA 11

* [OpenCV2] improve compatibility with CUDA 11

* [field3d] regenerate patch ignoring space at eol

* [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999)

* [field3d] regenerate patch ignoring space at eol

* [field3d] regenerate patch, again

* [field3d] fixes for windows

* [libass] fix regression

* ci.baseline.txt update

* [CUDA11] use FindCUDA from CMake 3.18 to ease transition later

* re-bump vtk and ffmpeg, which were lost with merges from master

* [OpenCV4] Halide feature is not broken anymore

* [field3d] regenerate hdf5 patch

* [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems...

* merge ci.baseline.txt from master and fix field3d patch

* remove rebuilding

* restore vtk CONTROL file

* update CONTROL files

* Trigger rebuild

* Update ports/freeimage/CONTROL

* Update ports/freeimage/CONTROL

* [opencv3/4] avoid tesseract dependency on uwp builds

* [opencv] add missing module search

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-07-27 17:43:23 -07:00
Matthias C. M. Troffaes
1f01a1fd25
[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>
2020-06-29 15:37:40 -07:00
Vicki Pfau
eede79eb27
Fix bootstrapping MSYS2 pacman (#11499) (#12080) 2020-06-24 11:29:28 -07:00
NancyLi1013
5058547304
[ffmpeg] Add avisynthplus support (#11946) 2020-06-23 13:40:35 -07:00
emptyVoid
a5e28c4b35
[vcpkg-acquire-msys] Improvement (#11810)
* [vcpkg-acquire-msys] Remove obsolete workaround.

* [vcpkg-acquire-msys] Don't refresh package database on package install.

* [vcpkg-acquire-msys] Drop no longer needed taskkill.

* Trigger CI rebuild to test vcpkg_acquire_msys.
2020-06-11 02:09:19 -07:00
emptyVoid
e792d1c171
[vcpkg-acquire-msys] Update pacman before any other package. (#11443)
* [vcpkg-acquire-msys] Update pacman manually to work around update issues.
2020-05-22 00:58:05 -07:00
Lily
b7c44f9807
[ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed (#8797)
* [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed

* [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed

* Fix conflict

* Fix conflict

* Fix conflict

* [ffmpeg] Remove include(vcpkg_common_functions)

* Remove include(vcpkg_common_functions)

* [ffmpeg] Fix patch apply failed

* Fix conflict

* [ffmpeg] Fix conflict

* [ffmpeg] Fix patch
2020-04-27 14:43:29 -07:00
Jack·Boos·Yu
774f4fe6dd
[ffmpeg] Install tools (#10486)
* [ffmpeg] Install tools

* [ffmpeg] Fix incorrect macro

* [ffmpeg] Re-fix installation

* re-trigger ci test
2020-03-27 19:40:10 -07:00
Marc Bertola
78a2116a4a
[ffmpeg] Add NVIDIA Codec feature for Windows and Linux (#9171)
* Add NVIDIA Codec support for Windows, Linux and Linux for Tegra

* [ffnvcodec] Fix typos, add/remove comments

* Bump nvcodec version to 9.1.23.1

* Update version number as per change request

* Use PORT variable instead of hardcoded portname

* Identify the release the hash pertains to

* Find nvcodec in 'installed' instead of 'packages'

* Force FFmpeg to look for nvcodec headers in the installed directory instead of /usr/lib/pkgconfig.

* Use p option on cygpath to convert full path in case it contains more than one entry
2020-03-24 13:00:09 -07:00
NancyLi1013
3d82def504
[ffmpeg] Fix build static error (#10368)
* [ffmpeg] Fix build static error

* Remove additional condition
2020-03-19 00:28:10 -07:00
Todor Prokopov
f478be7479
[many ports] Support building with MinGW toolchain (#8940)
* Some package fixes necessary to build with MinGW toolchain

* [libraqm] Fix build error caused by trying to write to source directory

* [tmxparser] Fix build failure when tmx port is intalled before tmxparser port

System include path was added first on compiler command line. This leads to
build failure when there is a tmx.h header file in system include path.

* [qt5-base][angle] Trigger CI rebuild

* [kd-soap] Fix build error

* Update ci.baseline

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-02-11 17:30:03 -08:00
Alexander Neumann
a626cd7fa0 [ffmpeg] fix link order (#9718)
* [ffmpeg] fix link order

closes #9714

* bump CONTROL

* change link order slightly
2020-01-22 12:20:32 -08:00
Alexander Neumann
529edbb3a4 [ffmpeg] fix openssl detection (#9695) 2020-01-16 11:23:49 -08:00
Matthias C. M. Troffaes
d6fb76bfc2 [ffmpeg] install correct copyright file and enable (L)GPLv3 builds (#9090)
* [ffmpeg] add version3 feature to enable (L)GPLv3 builds

* [ffmpeg] inspect log file to copy correct copyright file

* Bump version

* [ffmpeg] remove license status message
2019-12-23 15:37:41 -08:00
Todor Prokopov
20d49dcf62 [ffmpeg] Pass Vcpkg compiler and linker flags to build script 2019-10-14 14:03:01 +03:00
Stefano Sinigardi
839cdff896 [ffmpeg] update to 4.2 (#8021)
* [ffmpeg] update to 4.2

* [ffmpeg] add missing dependencies under linux
2019-09-23 13:46:16 -07:00
Martin Kröning
9a6f38041f [ffmpeg] Fix static linking on Windows, FindFFMPEG (#7739)
This adds zlib as dependency to make it possible to find in FindFFMPEG.cmake.
Also FFmpeg likes to autodetect zlib for additional features on compilation.
This removes the check for stdint.h, as it is included since MSVC 2010 and does not always find it.
To enable static linking on windows, bcript had to be added:

avutil.lib(random_seed.o) : error LNK2019: unresolved external symbol _BCryptOpenAlgorithmProvider@16 referenced in function _av_get_random_seed
avutil.lib(random_seed.o) : error LNK2019: unresolved external symbol _BCryptCloseAlgorithmProvider@8 referenced in function _av_get_random_seed
avutil.lib(random_seed.o) : error LNK2019: unresolved external symbol _BCryptGenRandom@16 referenced in function _av_get_random_seed
2019-08-19 08:41:49 -07:00
JackBoosY
8cbef1424a [ffmpeg]Add feature avresample. 2019-08-08 22:38:20 -07:00
JackBoosY
31ae6a0ecf [ffmpeg]Fix debug build in Windows. (#7476) 2019-08-06 16:25:50 -04:00
Stefano Sinigardi
47d206e149 [many ports] improvements for linux/wsl (#6730)
* [many ports] improve compatibility with WSL and mixed case filesystems

* [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there

* [libharu] add compatibility with non-win32 platforms

* [geogram] fix openblas on linux
[clapack] better integration with linux environment
[visit-struct] put cmake config file in the expected folder
[geogram] remove trailing underscore to enable compatibility with OpenBLAS

* [openblas] playing with underscore, without success

* [openblas/lapack] fix library integration

* [clapack] improve target handling in cmake module

* [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs

* [clapack,openblas] improve libraries integration

* [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags

* [suitesparse] improve integration with new lapack/openblas mechanism

* [suitesparse] add no underscore postfix also for linux

* [ceres] fix integration with newer openblas/lapack configs

* [aws-c-event-stream] fix regression

* [systemc] fix regression

* [libwebp,geogram] trigger rebuild

* [libwebp,pthread4w] fix regressions

* [glbinding] fix cmake module installation

* [globjects] disentangle unnecessary dependency from qt5

* [jasper] remove broken and unnecessary patches

* [libwebp] fix regression

* [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files

* [clapack] correctly find dlls

* [clapack] use a generic blas as dependency

* [fizz,g2o] restore expected version

* fix mistake

* [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports

* [libressl,openssl] do not try to build one if the other is already installed

* [itk] update ref and patch to avoid regression

* [libressl,openssl] implement full strategy to fix CI

* [libwebp] disable components that are broken on macOS

* [ogre] enable macOS build

* [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169

* [ogre] add missing install command

* [ffmpeg] enable wrapper for cmake module

* [ffmpeg] add avresample module finder

* [ffmpeg] improve module detection and exported symbols

* [ffmpeg] add variables to cache

* [thrift] remove unnecessary build option

* [allegro5] fix shared/static inversion

* [protobuf] cleanup

* [libressl] cleanup

* [moos-core] cleanup

* commented features must not be separated from other features, otherwise vcpkg complains

* [itk] fix regression

* [shogun,itk] fix regressions

* [ogre] fix regression

* [opusfile] add compatibility with non-win32

* [itk] fix regression

* [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile

* add missing dependencies

* [ismrmrd] fix regression

* [ffmpeg] trigger rebuild

* [clapack,openblas,libogg] fix regressions on macOS

* [libtins] fix regression

* force rebuild windows regressions, unable to reproduce locally

* [mosquitto] enable non-win32 builds

* [json-dto] force rebuild, unable to reproduce regression locally

* [many ports] uniform naming and path length requests

* fix regression

* fix regression

* [ffmpeg] fixes for downstream projects

* clean up - thanks to reviewers

* trigger rebuild of regressions on macOS

* trigger rebuild of regressions on macOS - part2

* Add core back

* Use VCPKG_CONCURRENCY

* Add core back to suitesparse

* Add core back to curl

* Add core back to magnum

* Add core back to magnum

* Add core back to magnum

* Add core back to cgal
2019-06-20 19:11:54 -07:00
pravic
18b029a5e3 [WIP] Add a Homepage URL entry for vcpkg ports (#2933)
* [vcpkg] Add "Homepage" field to the CONTROL files.
2019-06-15 16:54:47 -07:00
emptyVoid
05981587ce [FFmpeg] Add 'vpx' feature. (#6784) 2019-06-10 09:07:18 -07:00
Curtis J Bezault
52dfee03b5
Fix linking debug bzip2 (#6570) 2019-05-23 04:42:10 -07:00
Griffin Downs
0e00064405
Merge branch 'master' into master 2019-04-12 02:30:59 -07:00
Andre Abrantes
8c3e093d05 [fix][ffmpeg] changing $PATH separator for Linux (#6015)
* [fix][ffmpeg] changing $PATH separator for Linux

Using a semicolon in $PATH might break on some flavors of Linux, eg Docker based on Ubuntu 18.04.
2019-04-09 23:02:31 -07:00
Andre Abrantes
c4d48f9089 [fix][ffmpeg] fixing linux build (#5917)
* limit windows dep libs to windows

* fixing configure patch

* fixing detect-openssl.patch

* adapting portfile to linux

* adding a linux-specific build sh

* add missing endif()

* bumping version

* adding extra check for windows environment
2019-04-04 22:32:10 -07:00
Phil Christensen
2d444958c6
[ffmpeg] bump control version number 2019-03-28 15:14:27 -07:00
Unknown
8c3b87c95a allow building "ffmpeg.exe"
add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows-static --recurse
2019-02-28 05:23:41 -08:00
Phil Christensen
bf4a864a73 [msys2] bump control version in msys dependant ports 2018-12-21 00:42:50 -08:00
Peter Rekdal Sunde
351fbda5b8 Update ffmpeg to 4.1. 2018-11-27 10:04:57 +01:00
Robert Schumacher
cfd0d9c0e2 [vcpkg-find-acquire-program] Update version of YASM 2018-03-27 08:41:23 -07:00
Youngho Kim
5968ebf9f4 [ffmpeg] Add options 2018-03-19 08:42:47 -07:00