diff options
| author | Josue Andrade Gomes <josuegomes@gmail.com> | 2019-06-18 15:18:37 -0300 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-06-18 11:18:37 -0700 |
| commit | bd5007625e2c44e4474361d9cba5e03fa6e5aab7 (patch) | |
| tree | 0a762de7a8ccafa861594bbd1e8f6f6f4dc22901 | |
| parent | 49d1759ec85c31eb50d07b42d245b989b99df37c (diff) | |
| download | vcpkg-bd5007625e2c44e4474361d9cba5e03fa6e5aab7.tar.gz vcpkg-bd5007625e2c44e4474361d9cba5e03fa6e5aab7.zip | |
Graphicsmagick 1.3.32 (#6947)
* GraphicsMagick 1.3.32
* Fix missing header install
| -rw-r--r-- | ports/graphicsmagick/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ports/graphicsmagick/CONTROL | 2 | ||||
| -rw-r--r-- | ports/graphicsmagick/portfile.cmake | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/ports/graphicsmagick/CMakeLists.txt b/ports/graphicsmagick/CMakeLists.txt index 34c05a7b2..cf375e96d 100644 --- a/ports/graphicsmagick/CMakeLists.txt +++ b/ports/graphicsmagick/CMakeLists.txt @@ -28,6 +28,7 @@ include_directories("magick") include_directories("Magick++") include_directories("Magick++/lib") include_directories("wand") +include_directories("jbig/libjbig") file(READ "magick/magick_config.h.in" CONFIG_H) string(REPLACE "#undef HasBZLIB" "#define HasBZLIB" CONFIG_H "${CONFIG_H}") @@ -38,6 +39,7 @@ string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HAVE_FT2BUILD_H" "#define HAVE_FT2BUILD_H" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HasZLIB" "#define HasZLIB" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasJBIG" "#define HasJBIG" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef QuantumDepth" "#define QuantumDepth 16" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef restrict" "#define restrict" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_H "${CONFIG_H}") @@ -57,7 +59,7 @@ string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_API_H "${CONFIG_API_ file(WRITE "magick/magick_config_api.h" "${CONFIG_API_H}") add_library(graphicsmagick coders/art.c coders/avs.c - coders/bmp.c coders/cals.c coders/caption.c + coders/bmp.c coders/braille.c coders/cals.c coders/caption.c coders/cineon.c coders/clipboard.c coders/cmyk.c coders/cut.c coders/dcm.c coders/dcraw.c coders/dib.c coders/dps.c coders/dpx.c coders/emf.c coders/ept.c @@ -108,7 +110,8 @@ add_library(graphicsmagick coders/art.c coders/avs.c Magick++/lib/ImageRef.cpp Magick++/lib/Montage.cpp Magick++/lib/Options.cpp Magick++/lib/Pixels.cpp Magick++/lib/STL.cpp Magick++/lib/Thread.cpp Magick++/lib/TypeMetric.cpp - wand/drawing_wand.c wand/magick_compat.c wand/magick_wand.c wand/pixel_wand.c) + wand/drawing_wand.c wand/magick_compat.c wand/magick_wand.c wand/pixel_wand.c + jbig/libjbig/jbig.c jbig/libjbig/jbig_tab.c) TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE ZLIB::ZLIB @@ -158,7 +161,6 @@ option(INSTALL_HEADERS "Install development header files" ON) if (INSTALL_HEADERS) install(FILES magick/alpha_composite.h DESTINATION include/magick) install(FILES magick/analyze.h DESTINATION include/magick) - install(FILES magick/animate.h DESTINATION include/magick) install(FILES magick/api.h DESTINATION include/magick) install(FILES magick/attribute.h DESTINATION include/magick) install(FILES magick/average.h DESTINATION include/magick) @@ -181,7 +183,6 @@ if (INSTALL_HEADERS) install(FILES magick/delegate.h DESTINATION include/magick) install(FILES magick/deprecate.h DESTINATION include/magick) install(FILES magick/describe.h DESTINATION include/magick) - install(FILES magick/display.h DESTINATION include/magick) install(FILES magick/draw.h DESTINATION include/magick) install(FILES magick/effect.h DESTINATION include/magick) install(FILES magick/enhance.h DESTINATION include/magick) @@ -206,6 +207,7 @@ if (INSTALL_HEADERS) install(FILES magick/map.h DESTINATION include/magick) install(FILES magick/memory.h DESTINATION include/magick) install(FILES magick/module.h DESTINATION include/magick) + install(FILES magick/module_aliases.h DESTINATION include/magick) install(FILES magick/monitor.h DESTINATION include/magick) install(FILES magick/montage.h DESTINATION include/magick) install(FILES magick/nt_base.h DESTINATION include/magick) diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index b2ba96c95..631fd52f3 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,6 +1,6 @@ Source: graphicsmagick Maintainer: josuegomes@gmail.com -Version: 1.3.31-1 +Version: 1.3.32 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Homepage: https://sourceforge.net/projects/graphicsmagick/ Description: Image processing library diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index 87d03bd1f..b976bfbee 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(GM_VERSION 1.3.31) +set(GM_VERSION 1.3.32) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z" FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" - SHA512 ff67f5e6adf352527264e7a6a76d45ce34470263dc764760d876b9ab5d5078e3a46b9d9cb2e7ab52d53106ffe584d44c66b42f3d4d62c972662d488c86510881 + SHA512 1636f704bac65587d6526a10e7002a6158f951643a4e9eb936b0b734c1eb187155aa4d67febe897f9a2397ecadff736ba84cfe21704348e2d8481af01eff02f6 ) vcpkg_extract_source_archive_ex( |