diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-07 01:01:45 -0800 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-07 01:01:51 -0800 |
| commit | 8fd3e75c01d01c31b989f36173cd035508e09bee (patch) | |
| tree | 9c4607de1cf0571b229c8ebc0412ce411476abbc | |
| parent | 7f04a8bb634253c6924b79f08c0177b60e7fb3db (diff) | |
| download | vcpkg-8fd3e75c01d01c31b989f36173cd035508e09bee.tar.gz vcpkg-8fd3e75c01d01c31b989f36173cd035508e09bee.zip | |
[openimageio] Fix find dependency ffmpeg[avresample]
| -rw-r--r-- | ports/openimageio/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openimageio/fix-dependency.patch | 12 | ||||
| -rw-r--r-- | ports/openimageio/portfile.cmake | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index bd50a3dc9..2f357834d 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -13,7 +13,7 @@ Build-Depends: opencolorio Description: Enable opencolorio support for openimageio Feature: ffmpeg -Build-Depends: ffmpeg +Build-Depends: ffmpeg[avresample] Description: Enable ffmpeg support for openimageio Feature: field3d diff --git a/ports/openimageio/fix-dependency.patch b/ports/openimageio/fix-dependency.patch index c4df2184e..3dc3a16d0 100644 --- a/ports/openimageio/fix-dependency.patch +++ b/ports/openimageio/fix-dependency.patch @@ -1,5 +1,5 @@ diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 2f4f7ce..7275804 100644 +index 2f4f7ce..16035df 100644 --- a/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake @@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED) @@ -31,7 +31,15 @@ index 2f4f7ce..7275804 100644 DEFINITIONS -DUSE_OPENCV=1) # Intel TBB -@@ -233,12 +240,16 @@ checked_find_package (Field3D +@@ -226,19 +233,23 @@ checked_find_package (TBB 2017 + ISDEPOF OpenVDB) + + checked_find_package (DCMTK 3.6.1) # For DICOM images +-checked_find_package (FFmpeg 2.6) ++checked_find_package (FFMPEG) + checked_find_package (Field3D + DEPS HDF5 + DEFINITIONS -DUSE_FIELD3D=1) checked_find_package (GIF 4) checked_find_package (Libheif 1.3) # For HEIF/HEIC format checked_find_package (LibRaw) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 3a9a84d5b..c0e58b20a 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -16,6 +16,7 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/ext") file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake" "${SOURCE_PATH}/src/cmake/modules/FindWebp.cmake") file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") |