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

libtiff v4.3.0 #70

Merged
merged 1 commit into from
May 19, 2021
Merged

Conversation

regro-cf-autotick-bot
Copy link
Contributor

It is very likely that the current package version for this feedstock is out of date.
Notes for merging this PR:

  1. Feel free to push to the bot's branch to update this PR if needed.
  2. The bot will almost always only open one PR per version.
    Checklist before merging this PR:
  • Dependencies have been updated if changed: see upstream
  • Tests have passed
  • Updated license if changed and license_file is packaged

Note that the bot will stop issuing PRs if more than 3 Version bump PRs generated by the bot are open. If you don't want to package a particular version please close the PR.

NEW: If you want these PRs to be merged automatically, make an issue with @conda-forge-admin,please add bot automerge in the title and merge the resulting PR. This command will add our new bot automerge feature to your feedstock!

If this PR was opened in error or needs to be updated please add the bot-rerun label to this PR. The bot will close this PR and schedule another one. If you do not have permissions to add this label, you can use the phrase @conda-forge-admin, please rerun bot in a PR comment to have the conda-forge-admin add it for you.

This PR was created by the regro-cf-autotick-bot.
The regro-cf-autotick-bot is a service to automatically track the dependency graph, migrate packages, and propose package version updates for conda-forge. If you would like a local version of this bot, you might consider using rever. Rever is a tool for automating software releases and forms the backbone of the bot's conda-forge PRing capability. Rever is both conda (conda install -c conda-forge rever) and pip (pip install re-ver) installable.
Finally, feel free to drop us a line if there are any issues!
This PR was generated by https://github.com/regro/autotick-bot/actions/runs/851751651, please use this URL for debugging

Dependency Analysis

We couldn't run dependency analysis due to an internal error in the bot. :( Help is very welcome!

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@kmilos
Copy link
Contributor

kmilos commented May 18, 2021

If you remove the i/o patch, pillow and poppler no longer work (known cases, there might be more), as they are currently patched for the assumption of unix i/o...

OTOH, if the libtiff changes you referred to do indeed address the win32 vs unix i/o (TBC indeed), then the pillow and poppler code using _get_osfhandle() is no longer valid and would have to be eventually removed upstream as well?

@hmaarrfk
Copy link
Contributor

You are correct, their patch doesn't actually address the issue, it just hides the casting:

static inline thandle_t thandle_from_int(int ifd)
{
    return (thandle_t)(intptr_t)ifd;
}

static inline int thandle_to_int(thandle_t fd)
{
    return (int)(intptr_t)fd;
}


We need to update our patch.

@hmaarrfk hmaarrfk changed the title libtiff v4.3.0 WIP: libtiff v4.3.0 May 18, 2021
@hmaarrfk
Copy link
Contributor

If you could update the patch, I would be grateful.

@kmilos
Copy link
Contributor

kmilos commented May 18, 2021

Yep, that upstream code just addresses 32/64bit Windows IPC (to preserve the old 32-bit TIFFdOpen API), but that file descriptor to Windows HANDLE translation is still necessary somewhere...

@kmilos
Copy link
Contributor

kmilos commented May 19, 2021

Please try this updated use_unix_io.patch:

diff --git a/cmake/WindowsSupport.cmake b/cmake/WindowsSupport.cmake
index 93c1309..5a2eaa9 100644
--- a/cmake/WindowsSupport.cmake
+++ b/cmake/WindowsSupport.cmake
@@ -30,9 +30,6 @@ endif()
 
 # Win32 file I/O
 set(win32_io_default OFF)
-if(WIN32)
-    set(win32_io_default ON)
-endif()
 
 option(win32-io "Use Win32 I/O" ${win32_io_default})
 

@hmaarrfk
Copy link
Contributor

thanks

@hmaarrfk
Copy link
Contributor

@conda-forge-admin please rerender

@github-actions
Copy link
Contributor

Hi! This is the friendly automated conda-forge-webservice.
I tried to rerender for you, but it looks like there was nothing to do.

@hmaarrfk
Copy link
Contributor

If you are OK with your patch, it seems to be working. I can eneable automerge.

recipe/meta.yaml Outdated
# It seems that a recent patch in tifffile 4.1 may have broken
# binary compatibility on windows.
# https://gitlab.com/libtiff/libtiff/issues/173
# https://github.com/python-pillow/Pillow/issues/4237
# 2021/05/18 hmaarrfk: I believe that they addressed the issue in 4.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment no longer valid?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

@hmaarrfk
Copy link
Contributor

Maybe i malformed the patch

@hmaarrfk
Copy link
Contributor

we probably need to rerun the auto tools....

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I wanted to let you know that I linted all conda-recipes in your PR (recipe) and found some lint.

Here's what I've got...

For recipe:

  • Selectors are suggested to take a <two spaces>#<one space>[<expression>] form. See lines [38]

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@hmaarrfk hmaarrfk changed the title WIP: libtiff v4.3.0 libtiff v4.3.0 May 19, 2021
@kmilos
Copy link
Contributor

kmilos commented May 19, 2021

Btw, why not include libdeflate, lerc, and jbig in dependencies as well, also libwebp-base on win?

@hmaarrfk hmaarrfk merged commit bea8524 into conda-forge:master May 19, 2021
@hmaarrfk
Copy link
Contributor

Seems like it is good for an other PR.

@regro-cf-autotick-bot regro-cf-autotick-bot deleted the 4.3.0_had7522 branch May 19, 2021 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants