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.

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

OpenImageIO: conan 2 support, old version cleanup & version 2.4.17.0 & 2.5.6.0 added #19950

Merged
merged 93 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
bbaefe4
Convert OpenImageIO to build with conan 2.0
irieger Sep 15, 2023
6413828
Fix ptex dependency linking/include directory
irieger Sep 15, 2023
e299b79
Update license info to Apache 2
irieger Sep 15, 2023
1eee1eb
Convert OpenImageIO to build with conan 2.0
irieger Sep 15, 2023
846ba02
Fix ptex dependency linking/include directory
irieger Sep 15, 2023
35a7102
Update license info to Apache 2
irieger Sep 15, 2023
b4b44b1
Merge branch 'oiio-v2.4.15.0-conan2.0' of github.com:irieger/conan-ce…
irieger Sep 18, 2023
d083ea6
Small cleanup
irieger Sep 18, 2023
65ad55d
Fix linter warning for new conanfile
irieger Sep 18, 2023
ad49238
Rename legacy back to all to keep existing files untouched
irieger Sep 18, 2023
c21fd06
Update dependencies
irieger Sep 19, 2023
ac56a5b
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Sep 19, 2023
a70ce18
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Sep 19, 2023
6106af2
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Sep 19, 2023
6686c2e
Roll back opencolorio change
irieger Sep 19, 2023
c734786
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Oct 1, 2023
067a9c2
Bump WebP to 1.3.2 which includes an important security fix
irieger Oct 1, 2023
172e61a
Bump zlib requirement to range style
irieger Oct 1, 2023
d827e07
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Oct 3, 2023
812769d
Cleanup
irieger Oct 10, 2023
8b9e578
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Oct 10, 2023
f030538
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Nov 1, 2023
0c01491
OpenColorIO version prepared in separate branch
irieger Nov 2, 2023
4c8fb41
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Nov 13, 2023
ee8bbdb
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Nov 13, 2023
d604ef4
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Nov 13, 2023
031d572
Prepare for ffmpeg/6.0.1
irieger Nov 14, 2023
8282526
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Nov 14, 2023
0936bf7
Try to add Conan v2 and adding latest 2.4.17.0 version
irieger Nov 15, 2023
67ce26c
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Nov 15, 2023
55c0c03
Fix config.yml
irieger Nov 15, 2023
c710e64
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 3, 2023
cbfb910
Fixed cmake targets patch
irieger Dec 4, 2023
e38039f
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 4, 2023
f3701e9
Cleanup old versions to reduce the number of needed changes to make e…
irieger Dec 4, 2023
cc15cb5
Apply changes to old and current patches to ensure correct Cmake targ…
irieger Dec 4, 2023
cc0dc34
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 6, 2023
07a8563
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 9, 2023
7d39d70
Fix build for 2.4.7.1 (locally now building with conan 1 and 2)
irieger Dec 9, 2023
b44c6da
Fix linking to ensure that the conan fmt is used, build before due to…
irieger Dec 9, 2023
d106930
Add OpenImageIO 2.5.6.0
irieger Dec 9, 2023
b6e1f72
Fix ffmpeg requirement for old OIIO version + bump openexr
irieger Dec 10, 2023
0df9c03
Merge branch 'master' into oiio-v2.4.15.0-conan2.0
AbrilRBS Dec 10, 2023
e4183a0
Add version to config
irieger Dec 11, 2023
027da14
Remove accidential blank line
irieger Dec 11, 2023
2d44114
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 11, 2023
f54b71f
Fix patches for correct libheif linking
irieger Dec 11, 2023
8b6da65
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 11, 2023
05a4616
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 11, 2023
5169180
Merge branch 'master' into oiio-v2.4.15.0-conan2.0
uilianries Dec 12, 2023
2deeff7
Improve some includes and if-conditions
irieger Dec 12, 2023
a0482f7
Merge remote-tracking branch 'gh-irieger-cci/oiio-v2.4.15.0-conan2.0'…
irieger Dec 12, 2023
77ceaf0
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 12, 2023
040ee11
Small fixes in test package & patches
irieger Dec 12, 2023
50b628b
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 12, 2023
c8695fd
Add fmt required
irieger Dec 12, 2023
203f9f5
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 16, 2023
a827402
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Dec 17, 2023
fbaa2a3
Set fmt transitive
irieger Dec 17, 2023
7181fa2
Set transitive
irieger Dec 17, 2023
50b8555
Transitive imath
irieger Dec 18, 2023
2d13ca1
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Jan 16, 2024
4bfb3f7
OpenColorIO 2.3.1 & attempted fix for test package
irieger Jan 16, 2024
75eccf4
Attempted fix for requires
irieger Jan 16, 2024
f1531ce
Trying lower case imath requirement
irieger Jan 16, 2024
855fdc4
Update recipes/openimageio/all/conanfile.py
irieger Jan 31, 2024
f4c0cba
Merge branch 'master' into oiio-v2.4.15.0-conan2.0
irieger Jan 31, 2024
df09641
Update recipes/openimageio/all/conanfile.py
irieger Jan 31, 2024
3e55343
Import rm
irieger Jan 31, 2024
9bdf0ca
Fix license info
irieger Jan 31, 2024
366710b
Merge remote-tracking branch 'conan-idx-origin/master' into oiio-v2.4…
irieger Jan 31, 2024
bf89242
Fix test package path
irieger Jan 31, 2024
07dc3c5
Merge remote-tracking branch 'conan-idx-origin/master' into oiio-v2.4…
irieger Jan 31, 2024
4b0b216
Try to bypass windows path problem
irieger Jan 31, 2024
348f0b9
Merge remote-tracking branch 'conan-idx-origin/master' into oiio-v2.4…
irieger Jan 31, 2024
fdc3089
Fix test path
irieger Jan 31, 2024
f4cacb7
Adapt test package to package template
irieger Feb 1, 2024
6269210
Merge remote-tracking branch 'conan-idx-origin/master' into oiio-v2.4…
irieger Feb 1, 2024
00d5d41
Match freetype version of ffmpeg
irieger Feb 1, 2024
86a8759
Adapt to style comments for variable names
irieger Feb 1, 2024
cc000cb
Remove old version that requires a missing ffmpeg build of version 4.4.4
irieger Feb 1, 2024
340fd91
Try bumping all dependencies
irieger Feb 2, 2024
8902c67
Version range for libpng
irieger Feb 2, 2024
51b12c0
Merge remote-tracking branch 'conan-idx-origin/master' into oiio-v2.4…
irieger Feb 2, 2024
91d3fd6
Merge remote-tracking branch 'conan-idx-origin/master' into oiio-v2.4…
irieger Feb 6, 2024
4d06ccd
Apply suggestions from code review
irieger Feb 23, 2024
0042a4d
Merge branch 'master' into oiio-v2.4.15.0-conan2.0
irieger Feb 23, 2024
5c24ca6
Remove testing option
irieger Feb 23, 2024
a586d46
Merge branch 'master' into oiio-v2.4.15.0-conan2.0
AbrilRBS Feb 23, 2024
0227dae
Update recipes/openimageio/all/test_v1_package/CMakeLists.txt
AbrilRBS Feb 24, 2024
7966e9e
Update recipes/openimageio/all/test_package/CMakeLists.txt
AbrilRBS Feb 24, 2024
4aa31c0
Merge remote-tracking branch 'conan-idx-origin/master' into oiio-v2.4…
irieger Feb 24, 2024
72b6499
Merge remote-tracking branch 'origin/master' into oiio-v2.4.15.0-cona…
irieger Feb 25, 2024
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
19 changes: 0 additions & 19 deletions recipes/openimageio/all/CMakeLists.txt

This file was deleted.

38 changes: 16 additions & 22 deletions recipes/openimageio/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
sources:
"2.2.7.0":
url: "https://github.com/OpenImageIO/oiio/archive/Release-2.2.7.0.tar.gz"
sha256: "857ac83798d6d2bda5d4d11a90618ff19486da2e5a4c4ff022c5976b5746fe8c"
"2.2.18.0":
url: "https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.2.18.0.tar.gz"
sha256: "72597619f09b60cc2afc18f378b40fbec62701112957f43cff162dd9a52a26ce"
"2.3.7.2":
url: "https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.3.7.2.tar.gz"
sha256: "829c05d17610f1156c2a777310f4709b81f3a302fd11e3999ea4a865a5b4a5d3"
"2.4.7.1":
url: "https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.4.7.1.tar.gz"
sha256: "fd298f71e44c6776863db4b37c4a1388dba0d2eb37378afea95ab07a7cd6ecd4"
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v2.4.7.1.tar.gz"
sha256: "a3dc6fdb3693eb5f1e22191e41c05800a4944f3c76daffe90bd203f956180126"
"2.4.17.0":
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v2.4.17.0.tar.gz"
sha256: "7fe81d8e5bce30cc4a212f020ac3cc4344e6b7c1c0842475e3a048515099c65c"
"2.5.6.0":
url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v2.5.6.0.tar.gz"
sha256: "bcfced40a25ef8576383b44d8bbe3732aa2b8efc7b8614482783d6f90378d307"
patches:
"2.2.7.0":
- patch_file: "patches/2.2.7.0-cmake-targets.patch"
base_path: "source_subfolder"
"2.2.18.0":
- patch_file: "patches/2.2.18.0-cmake-targets.patch"
base_path: "source_subfolder"
"2.3.7.2":
- patch_file: "patches/2.3.7.2-cmake-targets.patch"
base_path: "source_subfolder"
"2.4.7.1":
- patch_file: "patches/2.4.7.1-cmake-targets.patch"
base_path: "source_subfolder"
patch_description: "Ensure project builds correctly with Conan (don't pick up disabled dependencies from the system, fix different spelling of libraries)"
patch_type: "conan"
- patch_file: "patches/2.4.7.1-fix-msvc2017.patch"
base_path: "source_subfolder"
patch_description: "Fix compile error with MSVC 2017"
patch_type: "official"
"2.4.17.0":

Check warning on line 19 in recipes/openimageio/all/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning

'patch_type' should have 'patch_source' as per https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patch_type it is expected to have a source (e.g. a URL) to where it originates from to help with reviewing and consumers to evaluate patches
- patch_file: "patches/2.4.17.0-cmake-targets.patch"
patch_description: "Ensure project builds correctly with Conan (don't pick up disabled dependencies from the system, fix different spelling of libraries)"
patch_type: "conan"
"2.5.6.0":
- patch_file: "patches/2.5.6.0-cmake-targets.patch"
patch_description: "Ensure project builds correctly with Conan (don't pick up disabled dependencies from the system, fix different spelling of libraries)"
patch_type: "conan"
Loading
Loading