Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[openimageio] Upgrade version, add features and fix build failure #8543

Merged
merged 14 commits into from
Feb 9, 2020
Merged

[openimageio] Upgrade version, add features and fix build failure #8543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
283abf3
[openimageio]Upgrade version and add features.
Oct 10, 2019
bb57bf4
[openimageio]Add definitions.
Oct 11, 2019
23c806d
[openimageio]Remove vcpkg_common_functions
Oct 30, 2019
0fba1ab
[openimageio] update to 2.1.9.0 and fix static build.
Dec 25, 2019
c667163
[openimageio] Fix generated cmake files.
Dec 25, 2019
88727b4
[openimageio] Remove feature ptex due to some link error. Fix depende…
Dec 26, 2019
9d0fc9a
[openimageio] Add feature tools
Dec 27, 2019
7400c26
[openimageio] Fix openimageio targets.cmake name
Dec 30, 2019
8eda8b2
[openimageio] Fix find openjpeg
Jan 2, 2020
7f04a8b
[openimageio] Add dependency pybind11
Jan 6, 2020
8fd3e75
[openimageio] Fix find dependency ffmpeg[avresample]
Jan 7, 2020
22419c5
[openimageio] Add feature python
Jan 13, 2020
2ae9ee4
[openimageio] Fix instructions for python
Jan 13, 2020
e97271e
[openimageio] Change feature name python to pybind11, add vcpkg_copy_…
Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[openimageio] Fix find dependency ffmpeg[avresample]
  • Loading branch information
JackBoosY committed Jan 7, 2020
commit 8fd3e75c01d01c31b989f36173cd035508e09bee
2 changes: 1 addition & 1 deletion ports/openimageio/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 10 additions & 2 deletions ports/openimageio/fix-dependency.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions ports/openimageio/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down