Commit Graph

59 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
NancyLi1013
5058547304
[ffmpeg] Add avisynthplus support (#11946) 2020-06-23 13:40:35 -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
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
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
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
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
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
Peter Rekdal Sunde
351fbda5b8 Update ffmpeg to 4.1. 2018-11-27 10:04:57 +01: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
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