Commit Graph

143 Commits

Author SHA1 Message Date
Stefano Sinigardi
a267ab118c
[ffmpeg] add -fPIC (#17298)
* [ffmpeg] enable position-independent-code

* [ffmpeg] update version refs

* [ffmpeg] fix regressions

* [ffmpeg] fix refs
2021-04-15 13:55:28 -07:00
Matthias C. M. Troffaes
b1e352c60e
[ffmpeg] no longer hardcode version strings in FindFFMPEG script (#17236)
* [ffmpeg] no longer hardcode version strings in FindFFMPEG script

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] use OUTPUT_VARIABLE for extract_version_from_component

* [ffmpeg] x-add-version

* Apply suggestions from code review

* [ffmpeg] fix minor typo

* [ffmpeg] fix another minor typo

* [ffmpeg] x-add-version

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-04-14 13:46:12 -07:00
Matthew Oliver
85a48c1ed5
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.

* [libxml2] Correct pkgconfig lib name.

* [libwebp] Use vcpkg_fixup_pkgconfig.

* [libssh] Export pkgconfig on windows.

Also move to using git to get source.

* [modplug] Export pkgconfig on windows.

* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.

* [openjpeg] Correct required static link libs in pkgconfig.

* [modplug] Combine vcpkg_from_github using variable.

* Update ports/libssh/CONTROL

* Improve portfile.cmake

* update version records.

* [openjpeg] Update libs in pkgcfg.

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

* update version records

* [libssh] Add pthread to pkgconfig when using mbedtls.

* [libssh] Correct pthread naming on windows.

* [fontconfig] Add libintl to pkgconfig on windows.

* update version records

* [ffmpeg] Fixup FindFFmpeg.

* [ffmpeg] speex now supports non-windows.

* [ffmpeg] Add feature libass.

* [ffmpeg] Add dav1d feature.

* [ffmpeg] Add feature ilbc.

* [ffmpeg] Add tensorflow feature.

* [ffmpeg] update version record.

* [ffmpeg] Add CI feature test.

* [ffmpeg] Limit features based on CI failures.

* [ffmpeg] Update version record.

* [ffmpeg] limit features based on ci.baseline.

* [various ports] Update supports field.

* [ffmpeg] Limit features more based on CI.

* update version records.

* [ffmpeg] Add detection of additional non target deps..

select_library_configurations_from_names currently detects the debug libs even for release builds as  _IMPORT_PREFIX was not being set.

* [aubio] Silence warning about FindFFMPEG.

* [pangolin] Use vcpkg supplied FindFFMPEG.

* update version files.

* [ffnvcodec] Set as not supporting uwp.

ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.

* [ffmpeg] Update feature all.

* update version records

* [tesseract] Wrap debug pkgcfg update.

* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.

* [libssh] Correct port version after merge.

* [ffmpeg] Fixup after merge.

* Update version files.

* [ffmpeg] Add opengl support.

* [ffmpeg] Update package version.

* [ffmpeg] Fix ffnvcodec support.

* [ffmpeg] Fix x265 detection on osx.

* [libvpx] Enable arm-uwp build.

* [ffmpeg] Fixup x265 patch.

* trigger sdl rebuild

* [ffmpeg] Disable opengl on osx.

* Revert "trigger sdl rebuild"

This reverts commit 94065bfe84.

* [ffmpeg] Disable failing features on osx.

* Update ports/ffmpeg/FindFFMPEG.cmake.in

Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>

* [ffmpeg] Add ass dependencies to FindFFmpeg.

* Update ports/ffmpeg/FindFFMPEG.cmake.in

Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>

* update version

* [fontconfig] disable pthread/json as they are not needed for lib builds.

Only used for tests.

* [ffmpeg] Enable fontconfig on static+windows.

* update versions

* update versions.

* Fix incorrectly included commits

* revert pangolin commit

Reverts most of 2543be2edf

* update versions

* Correct port version after merge.

* update versions.

* [ffmpeg] Fix cmake dependency detection on non-windows.

* Revert "revert pangolin commit"

This reverts commit f59bc5a53e.

* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.

* update versions.

* [ffmpeg] set CMP0072 policy.

* [wavpack] Fix cmake config export.

* [ffmpeg] Add optional system dependent libraries.

* update versions after merge.

* update versions.

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-07 10:06:55 -07:00
genevanmeter
db1df24767
[ffmpeg] Fix FindFFMPEG lib versions for building opencv[ffmpeg] (#16882)
* Fix FindFFMPEG lib versions for opencv[ffmpeg]

libavutil, libavdevice, etc. define their versions separate from FFMPEG main version in a version.h file located with each component headers.
This change fixes building opencv[ffmpeg] when it attempts to discover the individual versions of FFMPEG libs. Before this change opencv[ffmpeg] would build but the FFMPEG functionality was disabled since all the lib versions were set to 4.3.1

* Modified Port-Version of CONTROL to 13
Ran vcpkg.exe x-add-version ffmpeg

* Ran vcpkg.exe x-add-version ffmpeg --overwrite-version per Cheney-W's instructions

* Updated Port-Version of CONTROL to 1 for FFMPEG version 4.3.2

* Ran vcpkg x-add-version ffmpeg
2021-03-31 10:20:17 -07:00
omartijn
38c073dc7a
Upgrade ffmpeg to 4.3.2 (#16768)
* Upgrade ffmpeg to 4.3.2

* Update version list

Co-authored-by: Martijn Otto <git@martijnotto.nl>
2021-03-29 09:42:42 -07:00
NancyLi1013
2543be2edf
[pangolin] Fix static build error (#15593)
* [pangolin] Fix static build error

* Update versions

* Update dependency for pangolin

* Update pangolin.json
2021-03-11 12:14:34 -08:00
Matthias C. M. Troffaes
df76decfd6
[ffmpeg] avfilter: fix dependencies and linux library ordering (#16000)
* [ffmpeg] avfilter: fix library ordering on linux and fix feature dependencies

* [ffmpeg] bump port version

* [ffmpeg] add OpenGL, Foundation, CoreGraphics, AppKit and CoreImage for osx (needed for avfilter)

* [ffmpeg] update git-tree

* [ffmpeg] restrict new osx dependencies to avfilter feature

* [ffmpeg] update git-tree

* [ffmpeg] remove avfilter dependencies

Note this exposes a bug in upstream, will need fix in ffmpeg configure script itself.

* [ffmpeg] improve macos framework dependencies

* [ffmpeg] update git-tree

* [ffmpeg] patch for filter dependencies in configure script

* [ffmpeg] update git-tree

* [ffmpeg] apple framework fix: securetransport is part of avformat and not avdevice

* [ffmpeg] update git-tree
2021-02-08 18:09:01 -08:00
Matthias C. M. Troffaes
3c466eb80c
[ffmpeg] use nasm instead of yasm (#14547)
* [ffmpeg] use nasm instead of yasm

* [ffmpeg] bump port version

* [ffmpeg] remove old yasm path reference

* update baseline

* [ffmpeg] fall back to yasm on x86

* [ffmpeg] add comment in portfile about issue with ffmpeg nasm build for future reference

* [ffmpeg] update git-tree

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-01-27 18:29:58 -08:00
Jack·Boos·Yu
b23b7ea09f
[ffmpeg] fix up the pkgconfig files (#15127) 2020-12-21 19:22:13 -08:00
Long Nguyen
02f6b89775
[many ports] mingw support (#14556)
* [vcpkg_configure_make] Only rename import libs on MSVC

* [x264] Only rename import libs on MSVC

* [x265] Add libc++ and libstdc++ as system libs

* [ffmpeg] mingw support

* [libvpx] Set AS environment variable

* [vcpkg_common_definition] Fix a mistake in the prefix and suffix variables

* [vcpkg_configure_make] Strip leading -l from lib list before joining

* [mp3lame] Use vcpkg_configure_make + mingw support

* [x265] Escape the pluses

* [ffmpeg] Add compiler flags for mingw

* [ffmpeg] Add WINVER define in mf_utils.c

* [ffmpeg] Remove unnecessary patch in 0003-fic-windowsinclude.patch

* [mp3lame] Add missing dollar sign

Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>

* [x265] Remove static lib when building shared with mingw

* [libogg] Change library name to libogg on mingw

* [libogg] Bump port version

* [x265] Remove -l(std)c++ flag in pkgconfig file

* [vcpkg_configure_make] Try to fix huge diff

* [mp3lame] Add comment on deprecated function lame_init_old

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

Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-12-01 14:13:58 -08:00
Alexander Neumann
678e3057d6
[libpq/ffmpeg] Fix iconv/intl linkage not covered by CI (#14626)
* fix iconv naming in ffmpeg

* libpq fix features
2020-11-19 12:33:04 -08:00
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
9ac48a6c49
[ffmpeg] fix linking with iconv feature (#13481)
* [ffmpeg] fix linking with iconv feature

* [ffmpeg] use official iconv cmake target (broken for now, needs fix in libiconv, see #11776)

* [ffmpeg] fix typo in theora configuration

* [ffmpeg] switch to $<NOT:$<CONFIG:Debug>> for selecting release libraries

* [ffmpeg] use find_dependency(Iconv) on macos to better handle downstream REQUIRED

* Bump port version.

* [ffmpeg] remove iconv dependency on mac when it's not needed

Patch originally provided by @cenit
2020-09-24 12:34:21 -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
Rafael Kitover
085225b7ba
[ffmpeg] Use nproc - 1 build jobs for ffmpeg instead of 6. (#12659) 2020-08-31 17:14:14 -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
Lily
1658781750
[ffmpeg] Fix tools dependency dll file (#12063)
* [ffmpeg] Fix tools dependency dll file

* [ffmpeg] Fix tools install path

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-07-07 13:58:29 -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
9efff1124a
[ffmpeg] Disable vdpau in UNIX (#10161)
* [ffmpeg] Disable vdpau in UNIX

* [ffmpeg] Disable vdpau in OSX only

* [freerdp] Add warning message when building in non-windows

* revert 1ec7785491 changes
2020-03-27 20:34:59 -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
Alex
ac40b384d3 [ffmpeg] portfile: fix typo Relase->Release (#9405) 2019-12-21 14:04:38 -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
Curtis J Bezault
b69fd4adae
Merge pull request #7608 from JackBoosY/dev/jack/ffmpeg_avresample
[ffmpeg]Add feature avresample.
2019-08-14 14:46:42 -07:00
Stefano Sinigardi
4fb51523e9 [OpenCV] Update to v4.1.1 (#5169)
* [OpenCV] update to v4

* [OpenCV] update to v4.1

* [OpenCV] merge #6901 and #6812

* [OpenCV] port patches to v4.1

* [OpenCV] fix naming

* [OpenCV] fix regression with static linkage

* [OpenCV] fix linking to optional feature dependencies in static mode

* fix ffmpeg on some architectures

* trigger rebuild of regressions on macOS

* [zxing-cpp] fix opencv 4.1 compat

* [ogre] improve patching for static builds

* [OpenCV] fixes for extra features

* [OpenCV] drastically reduce patchset

* [OpenCV] fix regression on linux

* [OpenCV] fix regression on Windows

* [qt5] depends on qt5-activeqt only on windows

* update to v4.1.1

* [OpenCV] additional fixes for 4.1.1

* [OpenCV] fix Eigen3 feature integration

* [opencv] Fix compilation in UWP

* [opencv] Fix merge conflicts

* [ffmpeg] fix cmake module for osx

* [OpenCV] add pre-caching of optflow cuda package

* [gdcm] properly fix #6863 instead of wrong #6901

* [OpenCV] fix OpenMP feature

* [opencv] Add missing GetModuleHandle() call guard for UWP

* [freeimage] Do not depend on libwebp[all] on UWP

* [opencv] Set app container bit for UWP

* [zxing-cpp] Fail with explicit message in UWP

* [pthreads4w] fix target creation, missing dlls

* [pthreads4w] bump CONTROL

* [opencv,zxing-cpp] Fix OpenCV Video IO module

* [zxing-cpp] Revert unnecessary changes

* [opencv] Feature halide

* Fix regression in UWP

* [ffmpeg] remove unnecessary patch pointing to old OpenCV version

* [opencv] remove versioning from windows dll filenames

* [opencv] Move port to opencv4

* [opencv,opencv4] Make meta-package install OpenCV 4.1

* [opencv3] Rename old port opencv->opencv3

* Add failure messages when another OpenCV is already installed
2019-08-12 09:22:30 -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
driver1998
a85359f7d3 ffmpeg: enable arm/arm64 windows support (#6590)
* ffmpeg: enable arm/arm64 windows support

* ffmpeg: fix x64-uwp

* ffmpeg: remove outdated patch

* ffmpeg: remove outdated patch
2019-06-06 16:04:27 -07:00
Curtis J Bezault
12d202099e
[ffmpeg] Fix regression on windows (#6743)
* Correctly set environment variables for gcc/clang/icc

* refactor out some if statements

* Assume windows

* Make windows check consistent
2019-06-03 16:42:09 -07:00
Curtis J Bezault
9356be6b5a
[ffmpeg] Correctly set environment variables for gcc/clang/icc (#6694)
* Correctly set environment variables for gcc/clang/icc

* refactor out some if statements
2019-05-31 16:25:56 -07:00
Stefano Sinigardi
5898891125 [openexr,openimageio,suitesparse,theia] updates for non-win32 (#6371)
* [openexr,openimageio,suitesparse,theia] updates for non-win32

* [theia] use only valid cmake symbols

* [suitesparse] Fix build

* [lapack] still not properly integrating with other ports

* [lapack] intercept cmake module calls and substitute them with our defs

* [suitesparse,clapack] fixes for proper integration

* [ceres,clapack] bump CONTROL

* [suitesparse] remove unnecessary defs

* [clapack] improve wrapper logic

* [WIN32] remove wrong symbol

* [clapack] fix wrapper integration

* [Accelerate] use best framework when available

* [clapack] separate config from wrapper

* [clapack] fix paths and filenames

* [mlpack,armadillo,clapack] improve library handling

* [mlpack] remove unnecessary cmake option

* [clp,coinutils,osi,liblemon] dependencies of openmvg, improve compatibility with non-win32

* [openmvg] fix for case-sensitive filesystems

* [clp,coinutils,osi] simplify CMakeLists removing many unnecessary steps

* [sophus] Force rebuild

* [theia] fixes for linux, part1

* [io2d] remove broken sintax

* [fontconfig] bump version to remove CI cached failure

* [theia] fixes for linux, part2

* [theia] remove unnecessary empty folders and comments from portfile

* [theia] use correct build type removing forced vars in cmakelists.txt

* [openmvg] add missing suitesparse target detection

* [sophus] fix Suitesparse dependency

* [sophus,openmvg] use suitesparse lowercase for module compatibility on case-sensitive filesystems

* [suitesparse] fixes for case-sensitive filesystems

* [openmvg] use correct Eigen3 name for case-sensitive filesystems

* [sophus] trigger rebuild

* [shogun] use modern vcpkg style

* [shogun] add missing cmake system processor symbol
2019-05-31 15:48:17 -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
93ce6b4f27
[ffmpeg] switch to vcpkg_extract_source_archive_ex 2019-03-29 23:23:18 -07:00
Phil Christensen
2d444958c6
[ffmpeg] bump control version number 2019-03-28 15:14:27 -07:00
Griffin Downs
6cc00f90b5 Remove duplicate feature entries 2019-03-01 15:36:20 -08:00
Griffin Downs
3b509c5435 Merge branch 'dev/grdowns/4217' of https://github.com/microsoft/vcpkg into dev/grdowns/4217 2019-02-28 05:34:31 -08:00
Unknown
c3959c44b9 fix static build of ffmpeg-executables
build ffplay.exe etc. failed because we tried to link ".a"-libraries
2019-02-28 05:29:38 -08:00
Unknown
407fb7edb6 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 --recurse
2019-02-28 05:29:38 -08: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
Unknown
df4f0c0e5a fix static build of ffmpeg-executables
build ffplay.exe etc. failed because we tried to link ".a"-libraries
2018-09-03 00:38:59 +02:00
Unknown
6937490472 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 --recurse
2018-09-02 22:13:49 +02:00
Robert Schumacher
cfd0d9c0e2 [vcpkg-find-acquire-program] Update version of YASM 2018-03-27 08:41:23 -07:00
Alexander Karatarakis
aa57df6d6e [ffmpeg] Fail-fast if spaces are preset in the path 2018-03-23 17:02:23 -07:00
Youngho Kim
5968ebf9f4 [ffmpeg] Add options 2018-03-19 08:42:47 -07:00
Jacob Zhong
63901137f6 Add doxygen and add packages option to vcpkg_require_msys (#2869)
* Add doxygen to acquired programs

* Add packages option to msys function

* Add documentation for PACKAGES in vcpkg_require_msys

* [ffmpeg][x264] Update to use `PACKAGES` parameter. Tweak docs.
2018-02-24 00:00:51 -08:00
Robert Schumacher
175d25ae47 [ffmpeg] Deploy FindFFMPEG cmake file 2018-02-23 17:06:37 -08:00
Robert Schumacher
a40559a76d [ffmpeg] Bump version for PR #2783 2018-02-13 16:05:09 -08:00
Anonymous Maarten
317b2ea082 [ffmpeg] Allow static builds of ffmpeg (#2783)
ffmpeg creates static .a libraries, so change the suffix to .lib
2018-02-13 16:04:12 -08:00
Vlad Kolesnikov
30f7421602 Adding OpenSSL support to FFMPEG, fixed Assmimp UWP build (#2018)
* Enable ffmpeg to build using openssl for HTTPS/TLS support

* [ffmpeg] Add contract versions to libpath

* Updated FFMPEG to 3.3.3; Fixed unistd.h issue in ffmpeg build

* merge fix

* merge fix

* fix merge

* removed extra files

* Assimp UWP build fix

* [assimp] Bump version

* [ffmpeg] Implement openssl support through features.

* [opencv] remove ffmpeg depenency

OpenCV has own prebuilt ffmpeg library

* Fix version, package name is not a part of it

* Add support build option to PCL port

Add support build options (pcap, qt) to PCL port.

* Update VTK to 8.0.1

Update VTK to 8.0.1.

* [vcpkg] Enable pkg[*] as alias for all features.

* Using CP_UTF8 macro instead of magic numbers.

* [vcpkg] Add optional Abi field to BinaryParagraph for future use.

* [double-conversion] Fix --head builds

* [vcpkg] --head should only apply to USER_REQUESTED packages.

* [vcpkg] Fix bug where packages with uninstalled features appear to be uninstalled.

* Update Catch to 1.11.0

* Fix proxy usage in Win7 (powershell 2.0)

* [findVSInstances] Data lines are now placed within <sol><eol> tags. Text outside these tags is ignored

This means we can print text in powershell now and it won't break vcpkg.

* [fetchDependency] Now also returns output in the form <sol>data<eol>

* [git] Update to 2.15.0 (was 2.14.3)

* [bootstrap-vcpkg] Added better diagnostics in case of MSBuild failure.

* [poco] build with MySQL support (#2088)

* [poco] build with MySQL support

Set proper variables to enable MySQL support if libmysql port is installed

* [poco] Move Mysql support to a feature. Enable CMake config files.

* help assimp find vcpkg's copy of zlib so it does not build its own

* [assimp] Bump revision

* [assimp] Fix assimp overwriting CMAKE_PREFIX_PATH.

* [boost] Handle spaces in vcpkg path.

* [vcpkg] Fix use of features in undocumented build command

* Update to v1.2.0. Remove man pages

* [opencv] Remove ffmpeg from dependencies -- it is not currently possible to use an external ffmpeg with opencv.

Add features for cuda and vtk.

* Enable OpenGL support for GUI

Enable OpenGL support for GUI.

* [protobuf] Add feature packages for zlib

ZLib based features like Gzip streams.

* [llvm] Require Python3

* [blaze] Fix remaining stray _INVALID_ROOT_

* Add option to enable Qt GUI support

Add option to enable Qt GUI support.

* Sorting CMake options for maintainability

Sorting CMake options based on grouped of CMake-GUI  for
maintainability.

* VTK: implement features (#2071)

* [vtk/portfile] add OpenVR option

* [vtk/control] add OpenVR feature

* [vtk/portfile] Add OpenVR feature to portfile

* [vtk/CONTROL] add features

* [vtk/portfile] implement features

* [vtk/CONTROL] fix syntax

* [vtk/CONTROL] fix case

* [vtk/portfile] fix case

* [vtk/CONTROL] fix syntax

* [vtk/CONTROL] fix syntax

* [vtk/portfile] fix module name

* [vtk] Bump version

* [uwebsockets] Remove boost from dependency list to follow upstream's official README

* [libharu] Fix DLLIMPORT macro replacement

* Update CHANGELOG and bump version to v0.0.95

* Fix date in CHANGELOG.md

* [apr] Update to 1.6.3

* Enable C++11 features

Enable C++11 features.

* Enable Microsoft Media Foundation support for Video I/O

Enable Microsoft Media Foundation support for Video I/O.

* [double-conversion] Fix regression introduced in vcpkg_fixup_cmake_targets.

* [vcpkg] Refactor argument parsing to use common code paths.

* [vcpkg] Improve `vcpkg help` -- now has per-command help!

* [vcpkg-help-export-ifw] Add settings description

* [opencv] Disable MSMF in UWP due to an upstream bug

* [vcpkg_download_distfile] Now downloads in a temp dir and rename to the target location

* [vcpkg_find_acquire_program] Use vcpkg_download_distfile()

* Remove vcpkg_acquire_depot_tools

* [downloads] Don't show progress by default

* [vcpkg_acquire_msys] Use vcpkg_download_distfile()

* vcpkg_from_github] Use vcpkg_download_distfile()

* [vcpkg_from_bitbucket] Use vcpkg_download_distfile()

* [ports.cmake] Use vcpkg_download_distfile()

* [antlr] upgrade to antlr4.7

* [antlr4] bump version to 4.7

* Use download-at-temp-and-rename pattern in powershell too

* Print error message when there is a syntax error in triplet file

As it is now vcpkg fails silently (actually, it outputs two empty lines).

* [fdk-aac] init

* [fetchDependendy.ps1] Remove obsolete comment

* [fetchDependency.ps1] Improve error message on hash mismatch

* [vswhere] Update to 2.2.11 (was 2.2.7)

* libaiff

* Append W

* [libaiff] fix uninitialized buffer

* Add the flint2 library (#1988)

* Add the "flint2" library.

* FIX: update library name

* FIX: only set MSVC version to VC14

* FIX: use static linkage

* DOC: display notification to the user

* [flint/CONTROL] add gettimeofday dependency

* [flint/portfile] move up linkage

* [flint/portfile] attempt to override the CRT linkage

* Add arblib (#1991)

* Fix rename libraries of FLANN

Fix rename libraries of FLANN.

* Fix line endings

* [cmake] Update to 3.9.5 (was 3.9.4)

* Porting ITK

* Sourcing from GitHub, using a master version with vcpkg patch

* Update CHANGELOG and bump version to v0.0.96

* [fftw] update to 3.3.7

* [dlib] update to 19.7 and use vcpkg_from_github

* fix issue 2111

* Revert "Updated libsigcpp to version 2.99.9"

This reverts commit 079ef9785a.

* Added glibmm and giomm.

* Added atkmm.

* Added pangomm.

* Added gtkmm

* Use unicode

* [glibmm] Add missing dependency: libsigcpp
2017-11-04 14:54:12 -07:00
Raynor Vliegendhart
973b0e5346 [ffmpeg] Deal with case-sensitive env vars
When behind a corporate proxy, one often needs to specify `HTTP_PROXY` and `HTTPS_PROXY` for some command line tools to work properly. However, `pacman` seems to rely on the lowercase equivalent environment variables. In a Windows command prompt environment, it is not possible to set both since Windows environment variables are not case-sensitive. As a workaround, this build script checks for the existence of HTTP_PROXY and HTTPS_PROXY. If they exist, they are exported as lowercase variables.
2017-10-02 14:31:06 +02:00
atkawa7
779307a10e [ffmpeg] update to 3.3.3 2017-08-18 08:36:34 -07:00
Gilles Khouzam
9fe35b0d4d Fixing invocation of bash command to install gcc and perl for ffmpeg 2017-06-20 12:46:42 -07:00
Robert Schumacher
c8d638bcd6 [ffmpeg] Simplify UWP build slightly. Fix -MD/-MT to not apply during debug builds. 2017-06-20 01:08:17 -07:00
Gilles Khouzam
8085cd34f2 Adding support for FFmpeg in UWP.
Adding support to download gas-preprocessor as an acquire_program.
Update all packages for msys2
Download perl and gcc for ARM assembly in ffmpeg.
2017-06-19 12:49:20 -07:00
Robert Schumacher
6c26a42d54 [ffmpeg] Disable static building. 2017-03-02 10:35:27 -08:00
Robert Schumacher
782fa3000b [ffmpeg] Hotfix accounting for new flags 2017-03-02 08:26:39 -08:00
Robert Schumacher
2f8d8d8b18 [ffmpeg] Initial commit of version 3.2.4 2017-03-02 07:29:19 -08:00