Commit Graph

28 Commits

Author SHA1 Message Date
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
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
Matthias C. M. Troffaes
373915929e
[ffmpeg] fix optional X11 platform dependencies (#17625)
* [ffmpeg] fix optional X11 platform dependencies

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] version bump

* [ffmpeg] x-add-version

* [ffmpeg] version bump

* [ffmpeg] x-add-version
2021-05-06 13:48:26 -07:00
Matthias C. M. Troffaes
00b0e7878a
[ffmpeg] avdevice CoreAudio dependency fix for osx (#17204)
* [ffmpeg] avdevice needs CoreAudio on osx

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] version bump

* [ffmpeg] x-add-version
2021-05-06 07:14:23 -07:00
Matthias C. M. Troffaes
63c7a82c6a
[ffmpeg] add openh264 support (#17531)
* [ffmpeg] add openh264 support

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
2021-04-30 11:01:30 -07:00
Matthias C. M. Troffaes
d0f18bbccd
[ffmpeg] avdevice xcb linking fix on linux (#17467)
* [ffmpeg] avdevice depends on xcb on linux

* [ffmpeg] bump port version

* [ffmpeg] x-add-version
2021-04-28 14:35:29 -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
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
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
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
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
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
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
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
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