The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[openimageio] Fix find dependency ffmpeg[avresample]

Browse Source
This commit is contained in:
JackBoosY 2020-01-07 01:01:45 -08:00
parent 7f04a8bb63
commit 8fd3e75c01
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/openimageio/CONTROL
View File

@ -13,7 +13,7 @@ Build-Depends: opencolorio
Description: Enable opencolorio support for openimageio Description: Enable opencolorio support for openimageio
Feature: ffmpeg Feature: ffmpeg
Build-Depends: ffmpeg Build-Depends: ffmpeg[avresample]
Description: Enable ffmpeg support for openimageio Description: Enable ffmpeg support for openimageio
Feature: field3d Feature: field3d

12
ports/openimageio/fix-dependency.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake 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 --- a/src/cmake/externalpackages.cmake
+++ b/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake
@@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED) @@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED)
@ -31,7 +31,15 @@ index 2f4f7ce..7275804 100644
DEFINITIONS -DUSE_OPENCV=1) DEFINITIONS -DUSE_OPENCV=1)
# Intel TBB # 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 (GIF 4)
checked_find_package (Libheif 1.3) # For HEIF/HEIC format checked_find_package (Libheif 1.3) # For HEIF/HEIC format
checked_find_package (LibRaw) checked_find_package (LibRaw)

1
ports/openimageio/portfile.cmake
View File

@ -16,6 +16,7 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake"
"${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake"
"${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake"
"${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake"
"${SOURCE_PATH}/src/cmake/modules/FindWebp.cmake") "${SOURCE_PATH}/src/cmake/modules/FindWebp.cmake")
file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl")