Skip to content

[freeimage] Fix macOS build error #13916

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

Merged
dan-shaw merged 3 commits into from
Oct 9, 2020
Merged

[freeimage] Fix macOS build error #13916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dd8edb
[freeimage] fix osx build error from conflicting with mono framework
crjc Oct 7, 2020
35ed724
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Oct 8, 2020
141971e
Bump port-version.
BillyONeal Oct 8, 2020
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
2 changes: 1 addition & 1 deletion ports/freeimage/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: freeimage
Version: 3.18.0
Port-Version: 16
Port-Version: 17
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr
Homepage: https://sourceforge.net/projects/freeimage/
Description: Support library for graphics image formats
2 changes: 1 addition & 1 deletion ports/freeimage/use-external-png-zlib.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ index ba2ef17..c3c5cd6 100644
-#include "../ZLib/zlib.h"
-#include "../LibPNG/png.h"
+#include <zlib.h>
+#include <png.h>
+#include <libpng16/png.h>

// ----------------------------------------------------------

Expand Down