Improve handling of pystring include dir #1901
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Rémi Achard <remiachard@gmail.com>
|
This fixes the pystring patching we needed in the conan build up to now. (At least on my system but I assume that should be fine in general than.) (Couldn't test outside of Conan where Findyaml-cpp is used without the yaml-cpp patch as yaml-cpp 0.8.0 will not be found. But I think #1891 should solve that, at least does for me here) |
3 tasks
doug-walker
approved these changes
Nov 11, 2023
doug-walker
added a commit
to autodesk-forks/OpenColorIO
that referenced
this pull request
Dec 6, 2023
doug-walker
added a commit
to autodesk-forks/OpenColorIO
that referenced
this pull request
Dec 6, 2023
) Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 9078753) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com>
doug-walker
added a commit
that referenced
this pull request
Dec 8, 2023
* Fix support for X86 32-bit (#1842) Signed-off-by: Mark Reid <mindmark@gmail.com> (cherry picked from commit 16b3157) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Add some small arm neon optimizations (#1847) * Remove unused includes Signed-off-by: Mark Reid <mindmark@gmail.com> * Use neon hardware support for f16 conversions Signed-off-by: Mark Reid <mindmark@gmail.com> * Add some small neon optimizations use blendv,floor and fma intrinsics were possible Signed-off-by: Mark Reid <mindmark@gmail.com> --------- Signed-off-by: Mark Reid <mindmark@gmail.com> (cherry picked from commit 14f0afa) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Add links to new release notes documentation (#1848) Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 87126fa) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Changing version to 2.4.0 (#1852) Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 381d1fc) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Correctly recover CXX_FLAGS in CheckSupportSSE2.cmake (#1861) Signed-off-by: Chongyun Lee <uchkks@protonmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit c429400) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Fix regression in cccid handling when no value is supplied (#1855) In v1 of OCIO FileTransforms are able to load .cc files without specifying a cccid. In v2 this broke causing an exception to be raised instead of using the first cc found in the file. Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit c7ad353) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Fix missing cache id reset on look update. (#1873) Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> (cherry picked from commit dddbee0) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * ocioview: Curve Inspector improvements (#1845) * Curve inspector improvements - Move README to root app folder - Change curve inspector grid to always render as a square with 10 segments. - Add transform init callback to set new transform subscriptions to the current viewer if set to passthrough. Signed-off-by: Michael Dolan <michdolan@gmail.com> * Improve log range calculation Signed-off-by: Michael Dolan <michdolan@gmail.com> * Improve channel sample comparison Signed-off-by: Michael Dolan <michdolan@gmail.com> * Update src/apps/ocioview/ocioview/inspect/curve_inspector.py Signed-off-by: Michael Dolan <michdolan@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> Signed-off-by: Michael Dolan <michdolan@gmail.com> --------- Signed-off-by: Michael Dolan <michdolan@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 8add374) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Fix missing Default View Transform on equal operator (#1886) Add the missing assignment of the the default view transform when a config is copied using the equal operator Signed-off-by: Michael De Caria <decariamichael@gmail.com> Signed-off-by: Doug Walker <doug.walker@autodesk.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit bc8569b) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Remove circular import caused by typing annotations. (#1882) Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com> Signed-off-by: Doug Walker <doug.walker@autodesk.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 1fad466) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * fix(grammatical): Spelling mistakes (#1892) Signed-off-by: AbhineshJha <abhinesh_223002@saitm.org> Signed-off-by: Doug Walker <doug.walker@autodesk.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 0d00b2c) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Improve ocioview mac support and simplify dependencies (#1853) * PySide 6, remove imath, add imageio support Signed-off-by: Rémi Achard <remiachard@gmail.com> Remove Imath Signed-off-by: Rémi Achard <remiachard@gmail.com> Support imageio as fallback for openimageio Signed-off-by: Rémi Achard <remiachard@gmail.com> Further adjustments following latest updates Signed-off-by: Rémi Achard <remiachard@gmail.com> Fix pixel probe Signed-off-by: Remi Achard <remiachard@gmail.com> Add OpenColorIO to requirements Signed-off-by: Remi Achard <remiachard@gmail.com> * Fix rebase issue Signed-off-by: Remi Achard <remiachard@gmail.com> --------- Signed-off-by: Remi Achard <remiachard@gmail.com> Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com> Signed-off-by: Michael Dolan <michdolan@gmail.com> Co-authored-by: Thomas Mansencal <thomas.mansencal@gmail.com> Co-authored-by: Michael Dolan <michdolan@gmail.com> (cherry picked from commit 45544ce) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Issue #1874 Cast to unsigned char for isspace. (#1888) * Issue #1874 Cast to unsigned char for isspace. Signed-off-by: pylee <penne.y.lee@intel.com> * Add unit test. Signed-off-by: pylee <penne.y.lee@intel.com> * Add test comment as suggested in code review. Signed-off-by: pylee <penne.y.lee@intel.com> --------- Signed-off-by: pylee <penne.y.lee@intel.com> Signed-off-by: Doug Walker <doug.walker@autodesk.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit ed85207) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Tentative fix for the doxygen installation in the CI (Windows) (#1890) Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit b94a184) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Simplify the Findyaml-cpp module (#1891) This fixes compatibility with yaml-cpp 0.8, which previously failed because of a `get_property` call with the wrong target name. I took the liberty to add a few simplifications along the way. Signed-off-by: Tobias Mayer <tobim@fastmail.fm> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 1d3b695) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Skip processor concatenation if the display color space is also data. (#1896) * Skip processor concatenation if the display view transform is also data. Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> * Moved missing display color space exception before processor creation. Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> --------- Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 52b4965) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Restore GPU workflow and minor updates to CI (#1899) * Restore GPU workflow runs Signed-off-by: Rémi Achard <remiachard@gmail.com> * Enable undefined behaviour sanitizer Signed-off-by: Rémi Achard <remiachard@gmail.com> * Fix SIMD option for platform_latest Signed-off-by: Rémi Achard <remiachard@gmail.com> * Fix install_docs_env on CI workflow (not used at the moment) Signed-off-by: Rémi Achard <remiachard@gmail.com> * Fix OpenEXR build flag Signed-off-by: Rémi Achard <remiachard@gmail.com> --------- Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 382dcb6) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Improve handling of pystring include dir (#1901) Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 9078753) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Improve compatibility with minizip-ng COMPAT mode (#1902) Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit ffd0f70) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Fix NamedTransform context var issue (#1905) Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 4d64b32) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Fix env serialization for v1 configs (#1904) Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 4f4f30e) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Fix yaml-cpp build issues (#1907) Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit 41441bb) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Adsk Contrib - Improve heuristics for finding known color spaces (#1913) * Improve heuristics Signed-off-by: Doug Walker <doug.walker@autodesk.com> * Add some comments Signed-off-by: Doug Walker <doug.walker@autodesk.com> --------- Signed-off-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit d8852b5) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Add Python 3.12 wheels (#1898) Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit f2cfec3) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Increment library version to 2.3.1 Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> * Fix wrong RPATH being injected into Python bindings DSO (#1849) Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit ba2b41e) Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> --------- Signed-off-by: Mark Reid <mindmark@gmail.com> Signed-off-by: Doug Walker <Doug.Walker@autodesk.com> Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com> Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com> Signed-off-by: Chongyun Lee <uchkks@protonmail.com> Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> Signed-off-by: Michael Dolan <michdolan@gmail.com> Signed-off-by: Michael De Caria <decariamichael@gmail.com> Signed-off-by: Doug Walker <doug.walker@autodesk.com> Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com> Signed-off-by: AbhineshJha <abhinesh_223002@saitm.org> Signed-off-by: Remi Achard <remiachard@gmail.com> Signed-off-by: pylee <penne.y.lee@intel.com> Signed-off-by: Tobias Mayer <tobim@fastmail.fm> Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Mark Reid <mindmark@gmail.com> Co-authored-by: Kevin Wheatley <kevin.wheatley@framestore.com> Co-authored-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com> Co-authored-by: Uchiha Kakashi <45286352+licy183@users.noreply.github.com> Co-authored-by: Éric Renaud-Houde <eric.renaud.houde@gmail.com> Co-authored-by: Michael Dolan <michdolan@gmail.com> Co-authored-by: Michael De Caria <decariamichael@gmail.com> Co-authored-by: Thomas Mansencal <thomas.mansencal@gmail.com> Co-authored-by: Abhinesh <142514166+AbhineshJha@users.noreply.github.com> Co-authored-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: PenneLee <pennelee@gmail.com> Co-authored-by: tobim <tobim+github@fastmail.fm>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As mentioned in #1897 and #1900, there seem to be an issue with the way we look for and use pystring headers. In the case of homebrew package, the include is installed in
/usr/local/include/pystring.hwithout the pystring parent folder which prevents OCIO from finding it. This PR should allow us to adapt to the filesystem layouts possible.@irieger would be great if you have time to confirm it also work for the Conan package issue, I added your changes, thanks!