mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-30 20:48:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
c7b705fc05
vcpkg/ports/ffmpeg/0002-detect-openssl.patch

15 lines
1.1 KiB
Diff
Raw Normal View History

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 079ef9785ad539e1484f876577913a7269021288. * Added glibmm and giomm. * Added atkmm. * Added pangomm. * Added gtkmm * Use unicode * [glibmm] Add missing dependency: libsigcpp
2017-11-05 05:54:12 +08:00
diff --git a/configure b/configure
[ffmpeg] update to 4.2 (#8021) * [ffmpeg] update to 4.2 * [ffmpeg] add missing dependencies under linux
2019-09-24 04:46:16 +08:00
index 1c8008a..bd2de34 100755
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 079ef9785ad539e1484f876577913a7269021288. * Added glibmm and giomm. * Added atkmm. * Added pangomm. * Added gtkmm * Use unicode * [glibmm] Add missing dependency: libsigcpp
2017-11-05 05:54:12 +08:00
--- a/configure
+++ b/configure
[ffmpeg] update to 4.2 (#8021) * [ffmpeg] update to 4.2 * [ffmpeg] add missing dependencies under linux
2019-09-24 04:46:16 +08:00
@@ -6360,7 +6360,8 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP
[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-05 13:32:10 +08:00
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
[ffmpeg] update to 4.2 (#8021) * [ffmpeg] update to 4.2 * [ffmpeg] add missing dependencies under linux
2019-09-24 04:46:16 +08:00
- die "ERROR: openssl not found"; }
[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-05 13:32:10 +08:00
+ check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
[ffmpeg] update to 4.2 (#8021) * [ffmpeg] update to 4.2 * [ffmpeg] add missing dependencies under linux
2019-09-24 04:46:16 +08:00
+ die "ERROR: openssl not found"; }
enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
[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-05 13:32:10 +08:00
enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create &&
require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create &&
Reference in New Issue Copy Permalink