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

deps: Add build recipe for PNG #4423

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

deps: Add build recipe for PNG #4423

wants to merge 11 commits into from
+172 −47

Commits on Sep 13, 2024

  1. deps: Add build recipe for PNG 

    Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    9ac0a24 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Merge branch 'master' into build_PNG

    @zachlewis
    zachlewis committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    b21afd5 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. build: Add auto-build recipe for ZLIB (AcademySoftwareFoundation#4420) 

    Required for building redistributable python wheels on Windows Wheels
runners.

Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    5c57f6a View commit details
    Browse the repository at this point in the history

  2. test: Optimize running of oiiotool-demosaic test (AcademySoftwareFoun… 

    …dation#4429)

This test was running very slowly, taking too long in all circumstances,
but shockly causing GHA CI Mac runners to hit the test timeout
sometimes.

It turns out we were doing a lot of redundant work. There was no need to
make separate pattern and bayer images for every data type. Instead,
hoist the test image generation out of the loop and just make one
(float), then use `-i:type=<type>` to read it into an ImageBuf of the
appropriate data type.

This cuts the time for this test to run by about 3x.

Signed-off-by: Larry Gritz <[email protected]>
    @lgritz @zachlewis
    lgritz authored and zachlewis committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    cbb7b3c View commit details
    Browse the repository at this point in the history

  3. fix: Only build static, and turn off Framework build 

    MacOS builds require that PNG_FRAMEWORK=OFF in order to find and install dynamic libraries...
...but Windows still has trouble finding and installing dynamic libraries.

Only building static libraries seems to work, as far as building wheels is concerned; but I fear older dynamic libpngs found on the system will be preferred over newer static libpngs freshly-built by OIIO when linking.

Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e9ebd58 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. deps(PNG): set CMAKE_FIND_ROOT_PATH in build recipe 

    Attempt to force the build system to always find the locally-built PNG before any system-installed PNGs

Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    872968b View commit details
    Browse the repository at this point in the history

  2. fix: use find_package HINTS option 

    Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    aa2565d View commit details
    Browse the repository at this point in the history

  3. fix(PNG): typo in build recipe version comparison 

    *Now* it should use PNG's CMake Config....

Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fc10c76 View commit details
    Browse the repository at this point in the history

  4. deps(PNG): force build recipe to always (re)find the static PNG libs 

    Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fb520a7 View commit details
    Browse the repository at this point in the history

  5. deps(PNG): force build recipe to always build dynamic libs 

    Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    aa7afc1 View commit details
    Browse the repository at this point in the history

  6. deps(PNG): hint libpng16.cmake location to find_package 

    Signed-off-by: Zach Lewis <[email protected]>
    @zachlewis
    zachlewis committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    6f2d3a7 View commit details
    Browse the repository at this point in the history