Commit Graph

76 Commits

Author SHA1 Message Date
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
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
511ecd942e
[ffmpeg] fix dnn dependency (#17659)
* [ffmpeg] fix dnn dependency

The source file "libavfilter/dnn/dnn_backend_native.h" includes
"libavformat/avio.h", so avformat needs to be declared as a dependency.
This fixes the build of ffmpeg[core,avfilter]:x64-windows.

Posted upstream here:

http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html

Whilst at it, I've also added a link to the other avfilter patch:

http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html

* [ffmpeg] version bump

* [ffmpeg] x-add-version

* [openimageio] revert accidentally committed change that is meant for other PR
2021-05-05 13:09:30 -07:00
Matthias C. M. Troffaes
e8dbfcf679
[ffmpeg] soxr dependency fix (#17299)
* [ffmpeg] soxr only makes sense with swresample, so add as dependency

* [ffmpeg] bump port version

* [ffmpeg] x-add-version
2021-05-03 23:14:55 -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
talregev
3ec41f57e6
[libvpx] Fix libvpx compilation (install process) (#17287)
* Fix libvpx compilation (install process)

* [libvpx] Remove library and pdb suffixes.

* [ffmpeg] Remove fix for libvpx

* update version record

* Update ports/ffmpeg/CONTROL

* Update versions/f-/ffmpeg.json

* version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2021-04-19 14:26:08 -07:00
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
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00