MSYS2 fixes #4890
Merged
MSYS2 fixes #4890
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
1) it is hardcoded to 32-bit C:\msys64\mingw32 2) current library version uses \mingw64\include\libimagequant.h directly
Closed
radarhere
reviewed
Aug 30, 2020
Comment on lines
+324
to
+332
| mingw-w64-x86_64-libjpeg-turbo \ | ||
| mingw-w64-x86_64-zlib \ | ||
| mingw-w64-x86_64-libtiff \ | ||
| mingw-w64-x86_64-freetype \ | ||
| mingw-w64-x86_64-lcms2 \ | ||
| mingw-w64-x86_64-libwebp \ | ||
| mingw-w64-x86_64-openjpeg2 \ | ||
| mingw-w64-x86_64-libimagequant \ | ||
| mingw-w64-x86_64-libraqm |
There was a problem hiding this comment.
Suggested change
| mingw-w64-x86_64-libjpeg-turbo \ | |
| mingw-w64-x86_64-zlib \ | |
| mingw-w64-x86_64-libtiff \ | |
| mingw-w64-x86_64-freetype \ | |
| mingw-w64-x86_64-lcms2 \ | |
| mingw-w64-x86_64-libwebp \ | |
| mingw-w64-x86_64-openjpeg2 \ | |
| mingw-w64-x86_64-libimagequant \ | |
| mingw-w64-x86_64-libraqm | |
| mingw-w64-x86_64-freetype \ | |
| mingw-w64-x86_64-lcms2 \ | |
| mingw-w64-x86_64-libimagequant \ | |
| mingw-w64-x86_64-libjpeg-turbo \ | |
| mingw-w64-x86_64-libraqm | |
| mingw-w64-x86_64-libtiff \ | |
| mingw-w64-x86_64-libwebp \ | |
| mingw-w64-x86_64-openjpeg2 \ | |
| mingw-w64-x86_64-zlib \ |
Sorted
There was a problem hiding this comment.
The order is the same as in the External Libraries section above. I think it is more helpful to follow that order for easier cross-referencing if someone doesn't want a full install.
|
You could use /~https://github.com/marketplace/actions/setup-msys2 |
|
Thanks! |
lazka
added a commit
to lazka/MINGW-packages
that referenced
this pull request
Oct 19, 2020
Backports from python-pillow/Pillow#4890 Fixes msys2#7136
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.
Changes proposed in this pull request:
Remove old include directory
C:\\msys64\\mingw32\\include\\libimagequant.It uses a hardcoded path to MSYS2, it is hardcoded to 32-bit, and it is no longer necessary, as the include is now in
C:\\msys64\\mingw32\\include\\libimagequant.h.Remove GCC workaround for MSYS, see Replace distutils #4796 (comment)
Fix LibTiff support. The issue is that MSYS2 builds LibTiff with
USE_WIN32_FILEIO, which changes the meaning of thefdparameter forTIFFFdOpen, see OSError: -2 when decoding a tiff_lzw file #4237 (comment). I've added a workaround by converting the parameter before passing it to LibTiff if building on MinGW.It might be possible to detect the system version of LibTiff by including the
tif_config.hheader to fix OSError: -2 when decoding a tiff_lzw file #4237 (by enabling the workaround ifUSE_WIN32_FILEIOwas enabled), but it appears to be a private header (while it is available in MSYS2, it is not available in Ubuntu). See also passing build using CMake on Windows from my branch nulano/Pillow@mingw-setup...nulano:tiff-test.Another possible fix would involve absorbing
TIFFFdOpenfromtif_unix.cinto Pillow to avoid this issue by using the stableTiffClientOpen.Document installation on MSYS2