diff options
| author | carr-7 <57661759+carr-7@users.noreply.github.com> | 2020-10-09 19:00:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 11:00:17 -0700 |
| commit | 032f3e29cc345aa7e867d99a00ea5539c7e204b0 (patch) | |
| tree | d086f034a479f7fbaea2387db05aa7bc064ec52e | |
| parent | df9c8e260e66713dcf768630cd434caf2c29bbff (diff) | |
| download | vcpkg-032f3e29cc345aa7e867d99a00ea5539c7e204b0.tar.gz vcpkg-032f3e29cc345aa7e867d99a00ea5539c7e204b0.zip | |
[freeimage] Fix macOS build error (#13916)
* [freeimage] fix osx build error from conflicting with mono framework
* Bump port-version.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/freeimage/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freeimage/use-external-png-zlib.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index fea08c2fa..87435994c 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -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 diff --git a/ports/freeimage/use-external-png-zlib.patch b/ports/freeimage/use-external-png-zlib.patch index fc7837e43..da489b6b8 100644 --- a/ports/freeimage/use-external-png-zlib.patch +++ b/ports/freeimage/use-external-png-zlib.patch @@ -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> // ---------------------------------------------------------- |