mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-01 00:09:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[graphicsmagick] Updated to GraphicsMagick-1.3.34 (#9596)

Browse Source 
* Updated to GraphicsMagick-1.3.34

* Fixes after review
This commit is contained in:
Josue Andrade Gomes 2020-01-10 15:24:25 -03:00 committed by dan-shaw
parent 101452334c
commit 38b05598d8
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/graphicsmagick/CMakeLists.txt
View File

@ -111,7 +111,7 @@ add_library(graphicsmagick coders/art.c coders/avs.c
Magick++/lib/Pixels.cpp Magick++/lib/STL.cpp Magick++/lib/Thread.cpp Magick++/lib/Pixels.cpp Magick++/lib/STL.cpp Magick++/lib/Thread.cpp
Magick++/lib/TypeMetric.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) jbig/libjbig/jbig.c jbig/libjbig/jbig_ar.c jbig/libjbig/jbig85.c)
TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE
ZLIB::ZLIB ZLIB::ZLIB

2
ports/graphicsmagick/CONTROL
View File

@ -1,5 +1,5 @@
Source: graphicsmagick Source: graphicsmagick
Version: 1.3.33-1 Version: 1.3.34
Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
Homepage: https://sourceforge.net/projects/graphicsmagick/ Homepage: https://sourceforge.net/projects/graphicsmagick/
Description: Image processing library Description: Image processing library

17
ports/graphicsmagick/disable_graphicsmagick_modules.patch
View File

@ -1,11 +1,16 @@
--- a/magick/studio.h 2018-06-23 14:13:49.191541000 -0400 --- a/magick/studio.h 2019-12-24 13:18:50.000000000 -0200
+++ b/magick/studio.h 2018-09-02 11:50:41.856753700 -0400 +++ b/magick/studio.h 2020-01-08 20:43:08.325889700 -0200
@@ -414,7 +414,7 @@ @@ -470,10 +470,10 @@
#endif */
#if defined(HasLTDL) || ( defined(MSWINDOWS) && defined(_DLL) ) #if defined(HasLTDL)
-# define SupportMagickModules -# define SupportMagickModules
+//# define SupportMagickModules +//# define SupportMagickModules
#elif !defined(__MINGW32__) && !defined(__MINGW64__)
# if defined(MSWINDOWS) && defined(_DLL)
-# define SupportMagickModules
+//# define SupportMagickModules
# endif
#endif #endif
#if defined(_MAGICKMOD_)

17
ports/graphicsmagick/portfile.cmake
View File

@ -1,11 +1,9 @@
include(vcpkg_common_functions) set(GM_VERSION 1.3.34)
set(GM_VERSION 1.3.33)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z" URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z"
FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
SHA512 856fafe36693a7963f5944f489f4b7a0d15d9dcc575f96d31486e3abd886f681854cbb2271feb4b4cb19668480904d473138a2d9c2ec95539de705d75e2f49c9 SHA512 bc770070d3e6b58ded1932050c1aa9f31edd89ac68e12055d7bb481ba9aa8e7509e69ad676a1624c262f9b55c0ceeea738b807005946ddd97b88d49b39b8a073
) )
vcpkg_extract_source_archive_ex( vcpkg_extract_source_archive_ex(
@ -38,18 +36,15 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick) vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick)
# copy license # copy license
file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick) file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/copyright)
# copy config # copy config
file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config) file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config) file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config) file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK) file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK)
string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}") string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}")
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_test_cmake(PACKAGE_NAME unofficial-graphicsmagick)